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_cadence.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_cadence.c')
| -rw-r--r-- | drivers/serial/serial_cadence.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/serial_cadence.c b/drivers/serial/serial_cadence.c index a1b76d07dc..10df50642a 100644 --- a/drivers/serial/serial_cadence.c +++ b/drivers/serial/serial_cadence.c @@ -240,8 +240,8 @@ static int cadence_serial_probe(struct device_d *dev) clk_set_rate(priv->clk, clk_get_rate(priv->clk) / 8); priv->regs = dev_request_mem_region(dev, 0); - if (!priv->regs) { - ret = -EBUSY; + if (IS_ERR(priv->regs)) { + ret = PTR_ERR(priv->regs); goto err_free; } |