Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1611761 > unrolled thread
| Started by | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| First post | 2017-03-29 12:00 +0200 |
| Last post | 2017-03-30 21:40 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] mmc: host: s3cmci: fix broken conditional expression Arnd Bergmann <arnd@arndb.de> - 2017-03-29 12:00 +0200
Re: [PATCH] mmc: host: s3cmci: fix broken conditional expression Ulf Hansson <ulf.hansson@linaro.org> - 2017-03-30 21:40 +0200
| From | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| Date | 2017-03-29 12:00 +0200 |
| Subject | [PATCH] mmc: host: s3cmci: fix broken conditional expression |
| Message-ID | <tqiyu-55o-5@gated-at.bofh.it> |
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
[toc] | [next] | [standalone]
| From | Ulf Hansson <ulf.hansson@linaro.org> |
|---|---|
| Date | 2017-03-30 21:40 +0200 |
| Message-ID | <tqO5l-2G9-47@gated-at.bofh.it> |
| In reply to | #1611761 |
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
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web