diff options
| author | Roland Stigge <stigge@antcom.de> | 2012-06-17 21:13:34 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-06-17 22:24:32 +0100 |
| commit | f43380981716c9b48bf2809e4cd1cb0c6b71429d (patch) | |
| tree | f26be38acf0128624e17c9ef225ca951e2fcbc7c /drivers/mmc/host/mmci.c | |
| parent | 667d1b48bcb66b89776ebefbaf05b358bc5907ce (diff) | |
| download | linux-3.10-f43380981716c9b48bf2809e4cd1cb0c6b71429d.tar.gz linux-3.10-f43380981716c9b48bf2809e4cd1cb0c6b71429d.tar.bz2 linux-3.10-f43380981716c9b48bf2809e4cd1cb0c6b71429d.zip | |
ARM: 7426/1: mmc: mmci: Remove wrong error handling of gpio 0
Zero is a valid GPIO and shouldn't be handled as an error return code from
of_get_named_gpio(). It was a leftover from old code before getting
pdata->gpio_*() was modified.
Signed-off-by: Roland Stigge <stigge@antcom.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/mmc/host/mmci.c')
| -rw-r--r-- | drivers/mmc/host/mmci.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 0045ee001ec..78d3e484599 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1216,12 +1216,7 @@ static void mmci_dt_populate_generic_pdata(struct device_node *np, int bus_width = 0; pdata->gpio_wp = of_get_named_gpio(np, "wp-gpios", 0); - if (!pdata->gpio_wp) - pdata->gpio_wp = -1; - pdata->gpio_cd = of_get_named_gpio(np, "cd-gpios", 0); - if (!pdata->gpio_cd) - pdata->gpio_cd = -1; if (of_get_property(np, "cd-inverted", NULL)) pdata->cd_invert = true; |