diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-09-12 09:22:40 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-09-16 08:32:10 +0200 |
| commit | d5a82eb095def58f3a19127bb08ff96d799b63a5 (patch) | |
| tree | 70c6c203f5ba753634616f45155a5f5602218e3d | |
| parent | ed6e965824303255cacc1c1a195d3684caa26bce (diff) | |
| download | barebox-d5a82eb095def58f3a19127bb08ff96d799b63a5.tar.gz barebox-d5a82eb095def58f3a19127bb08ff96d799b63a5.tar.xz | |
resource: Let request_ioport_region return an error pointer
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | common/resource.c | 2 | ||||
| -rw-r--r-- | drivers/serial/serial_ns16550.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/resource.c b/common/resource.c index fd04f26f78..e4bbe15fd7 100644 --- a/common/resource.c +++ b/common/resource.c @@ -146,7 +146,7 @@ struct resource *request_ioport_region(const char *name, res = __request_region(&ioport_resource, name, start, end); if (IS_ERR(res)) - return NULL; + return ERR_CAST(res); return res; } diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c index 78a674a823..4ca74446b3 100644 --- a/drivers/serial/serial_ns16550.c +++ b/drivers/serial/serial_ns16550.c @@ -353,8 +353,8 @@ static int ns16550_init_ioport(struct device_d *dev, struct ns16550_priv *priv) return PTR_ERR(res); res = request_ioport_region(dev_name(dev), res->start, res->end); - if (!res) - return -ENODEV; + if (IS_ERR(res)) + return PTR_ERR(res); priv->iobase = res->start; |