]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
pinctrl: abx500: Specify failed sub-driver by ID instead of driver_data
authorLee Jones <lee.jones@linaro.org>
Wed, 8 May 2013 13:29:07 +0000 (14:29 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 14 May 2013 08:34:55 +0000 (10:34 +0200)
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 <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-abx500.c

index aa17f7580f617b05d7469c372656922f229a9803..2a2a9df90bbaae4ac936b1bb72461b80885e7b17 100644 (file)
@@ -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;
        }