From dc82bce50b6d7050c8a65682f5ea4078b293f171 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 15 Aug 2014 11:10:03 +0200 Subject: 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 Signed-off-by: Sascha Hauer --- drivers/serial/serial_imx.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'drivers/serial/serial_imx.c') 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); -- cgit v1.2.3