* [PATCH] mmc: host: s3cmci: fix broken conditional expression
@ 2017-03-29 9:52 Arnd Bergmann
2017-03-30 19:31 ` Ulf Hansson
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2017-03-29 9:52 UTC (permalink / raw)
To: Ben Dooks, Ulf Hansson
Cc: Arnd Bergmann, Heiner Kallweit, Sergio Prado, Sylwester Nawrocki,
Krzysztof Kozlowski, linux-arm-kernel, linux-mmc, linux-kernel
The DT support introduced a typo that gcc detects when -Wempty-body
is enabled:
drivers/mmc/host/s3cmci.c: In function 's3cmci_probe_pdata':
drivers/mmc/host/s3cmci.c:1543:29: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
if (pdata->wprotect_invert);
Clearly the ';' was not intended here, so remove it.
Fixes: 4b13f3b290d1 ("mmc: host: s3cmci: allow probing from device tree")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/mmc/host/s3cmci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index 09eab2120bbd..bbf1fbbc8e2a 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -1540,7 +1540,7 @@ static int s3cmci_probe_pdata(struct s3cmci_host *host)
if (pdata->no_detect)
mmc->caps |= MMC_CAP_NEEDS_POLL;
- if (pdata->wprotect_invert);
+ if (pdata->wprotect_invert)
mmc->caps2 |= MMC_CAP2_RO_ACTIVE_HIGH;
if (pdata->detect_invert)
--
2.9.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] mmc: host: s3cmci: fix broken conditional expression
2017-03-29 9:52 [PATCH] mmc: host: s3cmci: fix broken conditional expression Arnd Bergmann
@ 2017-03-30 19:31 ` Ulf Hansson
0 siblings, 0 replies; 2+ messages in thread
From: Ulf Hansson @ 2017-03-30 19:31 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Ben Dooks, Heiner Kallweit, Sergio Prado, Sylwester Nawrocki,
Krzysztof Kozlowski, linux-arm-kernel, linux-mmc, linux-kernel
On 29 March 2017 at 11:52, Arnd Bergmann <arnd@arndb.de> wrote:
> The DT support introduced a typo that gcc detects when -Wempty-body
> is enabled:
>
> drivers/mmc/host/s3cmci.c: In function 's3cmci_probe_pdata':
> drivers/mmc/host/s3cmci.c:1543:29: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
> if (pdata->wprotect_invert);
>
> Clearly the ';' was not intended here, so remove it.
>
> Fixes: 4b13f3b290d1 ("mmc: host: s3cmci: allow probing from device tree")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Thanks, applied for next!
Kind regards
Uffe
> ---
> drivers/mmc/host/s3cmci.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
> index 09eab2120bbd..bbf1fbbc8e2a 100644
> --- a/drivers/mmc/host/s3cmci.c
> +++ b/drivers/mmc/host/s3cmci.c
> @@ -1540,7 +1540,7 @@ static int s3cmci_probe_pdata(struct s3cmci_host *host)
> if (pdata->no_detect)
> mmc->caps |= MMC_CAP_NEEDS_POLL;
>
> - if (pdata->wprotect_invert);
> + if (pdata->wprotect_invert)
> mmc->caps2 |= MMC_CAP2_RO_ACTIVE_HIGH;
>
> if (pdata->detect_invert)
> --
> 2.9.0
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-30 19:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-29 9:52 [PATCH] mmc: host: s3cmci: fix broken conditional expression Arnd Bergmann
2017-03-30 19:31 ` Ulf Hansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®