diff mbox series

pinctrl: madera: Fix possible NULL pointer with pdata config

Message ID 20180828084537.22960-1-rf@opensource.cirrus.com
State New
Headers show
Series pinctrl: madera: Fix possible NULL pointer with pdata config | expand

Commit Message

Richard Fitzgerald Aug. 28, 2018, 8:45 a.m. UTC
If we are being configured via pdata we don't necessarily have
any gpio mappings being configured that way so pdata->gpio_config
could be NULL.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
---
 drivers/pinctrl/cirrus/pinctrl-madera-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Linus Walleij Aug. 29, 2018, 12:03 p.m. UTC | #1
On Tue, Aug 28, 2018 at 10:45 AM Richard Fitzgerald
<rf@opensource.cirrus.com> wrote:

> If we are being configured via pdata we don't necessarily have
> any gpio mappings being configured that way so pdata->gpio_config
> could be NULL.
>
> Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>

Patch applied for fixes.

Yours,
Linus Walleij
diff mbox series

Patch

diff --git a/drivers/pinctrl/cirrus/pinctrl-madera-core.c b/drivers/pinctrl/cirrus/pinctrl-madera-core.c
index ece41fb2848f..c4f4d904e4a6 100644
--- a/drivers/pinctrl/cirrus/pinctrl-madera-core.c
+++ b/drivers/pinctrl/cirrus/pinctrl-madera-core.c
@@ -1040,7 +1040,7 @@  static int madera_pin_probe(struct platform_device *pdev)
 	}
 
 	/* if the configuration is provided through pdata, apply it */
-	if (pdata) {
+	if (pdata && pdata->gpio_configs) {
 		ret = pinctrl_register_mappings(pdata->gpio_configs,
 						pdata->n_gpio_configs);
 		if (ret) {