diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:42 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:42 +0200 |
| commit | fa93e4fb602389c5a5d6991a86cf93ae6e92d016 (patch) | |
| tree | 570dc8a12e7410fb1f87ddb473ad5a5e64240846 /drivers/serial/serial_ns16550.c | |
| parent | 52a0febb3dbe06e233f04d5c670fd662b85c1d95 (diff) | |
| parent | d5a82eb095def58f3a19127bb08ff96d799b63a5 (diff) | |
| download | barebox-fa93e4fb602389c5a5d6991a86cf93ae6e92d016.tar.gz barebox-fa93e4fb602389c5a5d6991a86cf93ae6e92d016.tar.xz | |
Merge branch 'for-next/resource-err-ptr'
Diffstat (limited to 'drivers/serial/serial_ns16550.c')
| -rw-r--r-- | drivers/serial/serial_ns16550.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c index 09e6a6aba8..4ca74446b3 100644 --- a/drivers/serial/serial_ns16550.c +++ b/drivers/serial/serial_ns16550.c @@ -317,10 +317,12 @@ static int ns16550_init_iomem(struct device_d *dev, struct ns16550_priv *priv) int width; res = dev_get_resource(dev, IORESOURCE_MEM, 0); - if (!res) - return -ENODEV; + if (IS_ERR(res)) + return PTR_ERR(res); priv->mmiobase = dev_request_mem_region(dev, 0); + if (IS_ERR(priv->mmiobase)) + return PTR_ERR(priv->mmiobase); width = res->flags & IORESOURCE_MEM_TYPE_MASK; switch (width) { @@ -347,12 +349,12 @@ static int ns16550_init_ioport(struct device_d *dev, struct ns16550_priv *priv) int width; res = dev_get_resource(dev, IORESOURCE_IO, 0); - if (!res) - return -ENODEV; + if (IS_ERR(res)) + 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; |