diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-31 08:21:07 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-09-16 08:32:06 +0200 |
| commit | 92cc1b1f9e3363046583962859a3a8c054f4b94d (patch) | |
| tree | 087a6fcf3e62943e8828386f25bedcccbc8b5dec /drivers/gpio | |
| parent | dbea5e0e353773544094d7e73aa41ef369d081a5 (diff) | |
| download | barebox-92cc1b1f9e3363046583962859a3a8c054f4b94d.tar.gz barebox-92cc1b1f9e3363046583962859a3a8c054f4b94d.tar.xz | |
resource: Let dev_get_resource_by_name return an error pointer
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-generic.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpio/gpio-generic.c b/drivers/gpio/gpio-generic.c index 5c46282045..eeb4b4277c 100644 --- a/drivers/gpio/gpio-generic.c +++ b/drivers/gpio/gpio-generic.c @@ -13,6 +13,7 @@ #include <init.h> #include <malloc.h> +#include <linux/err.h> #include <linux/log2.h> #include <linux/basic_mmio_gpio.h> @@ -311,7 +312,7 @@ static void __iomem *bgpio_map(struct device_d *dev, const char *name, *err = 0; r = dev_get_resource_by_name(dev, IORESOURCE_MEM, name); - if (!r) + if (IS_ERR(r)) return NULL; if (resource_size(r) != sane_sz) { @@ -343,8 +344,8 @@ static int bgpio_dev_probe(struct device_d *dev) struct bgpio_pdata *pdata = dev->platform_data; r = dev_get_resource_by_name(dev, IORESOURCE_MEM, "dat"); - if (!r) - return -EINVAL; + if (IS_ERR(r)) + return PTR_ERR(r); sz = resource_size(r); |