diff options
| author | Philipp Zabel <p.zabel@pengutronix.de> | 2014-08-15 11:10:03 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-09-05 07:43:29 +0200 |
| commit | dc82bce50b6d7050c8a65682f5ea4078b293f171 (patch) | |
| tree | c1e76cdabe07c6a789646a5fb9776c1fa5a386ed | |
| parent | 2fbba4e4d573273034a19703a6d0cbe29c21e418 (diff) | |
| download | barebox-dc82bce50b6d7050c8a65682f5ea4078b293f171.tar.gz barebox-dc82bce50b6d7050c8a65682f5ea4078b293f171.tar.xz | |
serial: imx: Fix for non-devicetree boards
Commit 3843bfd0ab77eaf125ca617922927b61fc8ded74
"serial: imx: Determine device name from device tree"
broke this driver for non-devicetree boards, since
of_alias_get may not be called with a NULL pointer
as first argument.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/serial/serial_imx.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c index 474bfafff0..e379f29610 100644 --- a/drivers/serial/serial_imx.c +++ b/drivers/serial/serial_imx.c @@ -338,9 +338,11 @@ static int imx_serial_probe(struct device_d *dev) cdev->flush = imx_serial_flush; cdev->setbrg = imx_serial_setbaudrate; cdev->linux_console_name = "ttymxc"; - devname = of_alias_get(dev->device_node); - if (devname) - cdev->devname = xstrdup(devname); + if (dev->device_node) { + devname = of_alias_get(dev->device_node); + if (devname) + cdev->devname = xstrdup(devname); + } imx_serial_init_port(cdev); |