From: Lee Jones Date: Wed, 8 May 2013 13:29:07 +0000 (+0100) Subject: pinctrl: abx500: Specify failed sub-driver by ID instead of driver_data X-Git-Tag: v3.10-rc2~4^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2fcad12eb4d80b174c69bfbc34d1c094ad37e1bd;p=thirdparty%2Flinux.git pinctrl: abx500: Specify failed sub-driver by ID instead of driver_data If a sub-driver has not been specified correctly, there is a good chance that plat_id is NULL, hence using an attribute of plat_id in the error message is likely to not only fail the driver but Oops the kernel. Use the failed ID instead. Signed-off-by: Lee Jones Signed-off-by: Linus Walleij --- diff --git a/drivers/pinctrl/pinctrl-abx500.c b/drivers/pinctrl/pinctrl-abx500.c index aa17f7580f617..2a2a9df90bbaa 100644 --- a/drivers/pinctrl/pinctrl-abx500.c +++ b/drivers/pinctrl/pinctrl-abx500.c @@ -900,8 +900,7 @@ static int abx500_gpio_probe(struct platform_device *pdev) abx500_pinctrl_ab8505_init(&pct->soc); break; default: - dev_err(&pdev->dev, "Unsupported pinctrl sub driver (%d)\n", - (int) platid->driver_data); + dev_err(&pdev->dev, "Unsupported pinctrl sub driver (%d)\n", id); mutex_destroy(&pct->lock); return -EINVAL; }