From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754468AbcGLOJc (ORCPT ); Tue, 12 Jul 2016 10:09:32 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:22603 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754400AbcGLOJ2 (ORCPT ); Tue, 12 Jul 2016 10:09:28 -0400 X-AuditID: cbfec7f5-f792a6d000001302-b2-5784fa15303b From: Krzysztof Kozlowski To: Ulf Hansson , Jaehoon Chung , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz Subject: [PATCH 2/2] mmc: dw_mmc: Print proper voltage on error Date: Tue, 12 Jul 2016 16:08:22 +0200 Message-id: <1468332502-28016-2-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1468332502-28016-1-git-send-email-k.kozlowski@samsung.com> References: <1468332502-28016-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpkluLIzCtJLcpLzFFi42I5/e/4VV3RXy3hBucv8FhsnLGe1eLGrzZW i9cvDC0u75rDZnHkfz+jxfG14Q5sHneu7WHz6NuyitHj8ya5AOYoLpuU1JzMstQifbsEroy/ ix6wFbxlr1hyKryBcQNbFyMnh4SAicTSmzNYIGwxiQv31gPFuTiEBJYySuxYtJMdwmlkknh0 spERpIpNwFhi8/IlYFUiAr2MEp0Td4IlmAUyJTr3zmUHsYUF7CWmnfkMNpZFQFWiY8U0oBoO Dl4Bd4mTl3whtslJnDw2mRXE5hTwkPj88iRYiRBQyeFJ5hMYeRcwMqxiFE0tTS4oTkrPNdIr TswtLs1L10vOz93ECAmYrzsYlx6zOsQowMGoxMPbcbI5XIg1say4MvcQowQHs5IIb8a3lnAh 3pTEyqrUovz4otKc1OJDjNIcLErivDN3vQ8REkhPLEnNTk0tSC2CyTJxcEo1MApISH69fOJa gWVewvx7h9RPcsjysYt1nljt0L1yDsdD7osfxQPuVfdrbTik2Pkz/cfclouBMY7/N9clGvE9 OiIUpLVLQ/+oW0ekudMxkR/LBDd759xY96aFubzl4/9D6jd9z8zXNT0lKfAi/45g1oTQtztE lxhPWfTCqX7fUVdJ/e7Y6/8DjyqxFGckGmoxFxUnAgAlnW12FAIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The commit 97f659a2e972 ("mmc: dw_mmc: prevent to set the wrong value") reordered the code so the 'uhs' variable used in mmc_regulator_set_vqmmc() error message is always 0 at that time thus always printing 3.3 voltage. Instead use value obtained from ios in printed error message. Signed-off-by: Krzysztof Kozlowski --- drivers/mmc/host/dw_mmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index c2a128628b31..7de561065003 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1416,8 +1416,8 @@ static int dw_mci_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios) ret = mmc_regulator_set_vqmmc(mmc, ios); if (ret) { dev_err(&mmc->class_dev, - "Regulator set error %d - %s V\n", - ret, uhs & v18 ? "1.8" : "3.3"); + "Regulator set error %d - %s\n", + ret, mmc_voltage_to_str(ios)); return ret; } -- 1.9.1