Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 953e9e93 authored by Axel Lin's avatar Axel Lin Committed by Linus Walleij
Browse files

pinctrl: nomadik: Prevent NULL dereference if of_match_device returns NULL 



of_match_device() may return NULL.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent e7ed6718

drivers/pinctrl/pinctrl-nomadik.c

+8 −3
Original line number Diff line number Diff line
@@ -1864,9 +1864,14 @@ static int __devinit nmk_pinctrl_probe(struct platform_device *pdev) 


	if (platid)

		version = platid->driver_data;

	else if (np)

		version = (unsigned int)

			of_match_device(nmk_pinctrl_match, &pdev->dev)->data;

	else if (np) {

		const struct of_device_id *match;



		match = of_match_device(nmk_pinctrl_match, &pdev->dev);

		if (!match)

			return -ENODEV;

		version = (unsigned int) match->data;

	}



	/* Poke in other ASIC variants here */

	if (version == PINCTRL_NMK_STN8815)