diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2015-10-21 10:12:00 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2015-10-27 13:26:31 +0300 |
| commit | b2f68b6306dbdbfd9b8cf46c697b52efa78f9ad6 (patch) | |
| tree | 0618610fdc7826c6302247e17d098f83ccd973e8 | |
| parent | c307b002548590c5d8c32b964831de671ad4affe (diff) | |
| download | linux-b2f68b6306dbdbfd9b8cf46c697b52efa78f9ad6.tar.xz | |
gpio: generic: Revert to old error handling in bgpio_map
Returning an error instead of NULL in bgpio_map if
platform_get_resource_byname does not find a resource was introduced with
commit cf3f2a2c8bae ("gpio: generic: improve error handling in bgpio_map").
This results in several qemu runtime failures with default and non-default
configurations, if attempts are made to boot from mmcblk0. Examples for
failures with multi_v7_defconfig are
Machine: vexpress-a9 dtb: vexpress-v2p-ca9
Machine: vexpress-a15 dtb: vexpress-v2p-ca15-tc1
Crash:
VFS: Cannot open root device "mmcblk0" or unknown-block(0,0): error -6
Please append a correct "root=" boot option; here are the available partitions:
Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,0)
Looking into the code, always returning an error if bgpio_map fails
does not appear to make much sense, since the code in bgpio_setup_io
specifically supports some of the resources to be NULL.
Fixes: cf3f2a2c8bae ("gpio: generic: improve error handling in bgpio_map")
Cc: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | drivers/gpio/gpio-generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-generic.c b/drivers/gpio/gpio-generic.c index d8b1700b9519..bd5193c67a9c 100644 --- a/drivers/gpio/gpio-generic.c +++ b/drivers/gpio/gpio-generic.c @@ -586,7 +586,7 @@ static void __iomem *bgpio_map(struct platform_device *pdev, r = platform_get_resource_byname(pdev, IORESOURCE_MEM, name); if (!r) - return IOMEM_ERR_PTR(-EINVAL); + return NULL; sz = resource_size(r); if (sz != sane_sz) |