summaryrefslogtreecommitdiffstats
path: root/drivers/gpio
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-07-31 08:38:08 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-09-16 08:32:09 +0200
commitdde56d42ad1763dd81a3de65b74d7387d12f6fa9 (patch)
tree888d48be1b4beaaa73195f1879a9369d84c5af88 /drivers/gpio
parent82ed2054665a2c6caa7b7a69143583e051289812 (diff)
downloadbarebox-dde56d42ad1763dd81a3de65b74d7387d12f6fa9.tar.gz
barebox-dde56d42ad1763dd81a3de65b74d7387d12f6fa9.tar.xz
resource: Let request_iomem_region 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.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-generic.c b/drivers/gpio/gpio-generic.c
index eeb4b4277c..1524a3304b 100644
--- a/drivers/gpio/gpio-generic.c
+++ b/drivers/gpio/gpio-generic.c
@@ -15,6 +15,7 @@
#include <malloc.h>
#include <linux/err.h>
#include <linux/log2.h>
+#include <linux/err.h>
#include <linux/basic_mmio_gpio.h>
static void bgpio_write8(void __iomem *reg, unsigned int data)
@@ -321,8 +322,8 @@ static void __iomem *bgpio_map(struct device_d *dev, const char *name,
}
ret = request_iomem_region(dev_name(dev), r->start, r->end);
- if (!ret) {
- *err = -ENOMEM;
+ if (IS_ERR(ret)) {
+ *err = PTR_ERR(ret);
return NULL;
}