summaryrefslogtreecommitdiffstats
path: root/drivers/serial/serial_imx.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-03-11 10:49:48 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2016-03-11 10:49:48 +0100
commit690ec1804cc8acbcc1afe3cc132dfcabfc7d11d5 (patch)
treea4b1bc34272ef576fe876b8edf9073bcc687293d /drivers/serial/serial_imx.c
parentd69ea86d795aea0ad833f271f0690e5e02b8bbb6 (diff)
parent3bd69ad077a955b469baa90d938fd83510297335 (diff)
downloadbarebox-690ec1804cc8acbcc1afe3cc132dfcabfc7d11d5.tar.gz
Merge branch 'for-next/driver'
Diffstat (limited to 'drivers/serial/serial_imx.c')
-rw-r--r--drivers/serial/serial_imx.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c
index 563813a..f140310 100644
--- a/drivers/serial/serial_imx.c
+++ b/drivers/serial/serial_imx.c
@@ -206,6 +206,7 @@ static int imx_clocksource_clock_change(struct notifier_block *nb,
static int imx_serial_probe(struct device_d *dev)
{
+ struct resource *iores;
struct console_device *cdev;
struct imx_serial_priv *priv;
uint32_t val;
@@ -228,7 +229,10 @@ static int imx_serial_probe(struct device_d *dev)
goto err_free;
}
- priv->regs = dev_request_mem_region(dev, 0);
+ iores = dev_request_mem_resource(dev, 0);
+ if (IS_ERR(iores))
+ return PTR_ERR(iores);
+ priv->regs = IOMEM(iores->start);
cdev->dev = dev;
cdev->tstc = imx_serial_tstc;
cdev->putc = imx_serial_putc;