From d95f27aaa83381ce210d3b285ad2647ce0313bbb Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Tue, 7 Jan 2014 22:48:17 +0400 Subject: [PATCH] of: platform: Fix possible crash "dev" may uninitialized or points to incorrect device. While at it make the message more informative. Signed-off-by: Alexander Shiyan Signed-off-by: Sascha Hauer --- drivers/of/platform.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/of/platform.c b/drivers/of/platform.c index e75a69b34..72e75cc07 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -174,9 +174,6 @@ static struct device_d *of_platform_device_create(struct device_node *np, } } - debug("register device 0x%08x\n", - (num_reg) ? dev->resource[0].start : (-1)); - /* setup generic device info */ dev = xzalloc(sizeof(*dev)); dev->id = DEVICE_ID_SINGLE; @@ -186,6 +183,9 @@ static struct device_d *of_platform_device_create(struct device_node *np, dev->num_resources = num_reg; of_device_make_bus_id(dev); + debug("%s: register device %s, io=0x%08x\n", __func__, dev_name(dev), + (num_reg) ? dev->resource[0].start : (-1)); + ret = platform_device_register(dev); if (!ret) return dev;