[PATCH 2/4] pinctrl: kirkwood: Prevent NULL dereference if of_match_device returns NULL
From: Axel Lin <hidden>
Date: 2012-11-15 04:52:47
Also in:
lkml
Subsystem:
arm/marvell kirkwood and armada 370, 375, 38x, 39x, xp, 3700, 7k/8k, cn9130 soc support, pin control subsystem, the rest · Maintainers:
Andrew Lunn, Gregory Clement, Sebastian Hesselbarth, Linus Walleij, Linus Torvalds
of_match_device() may return NULL. Signed-off-by: Axel Lin <redacted> --- drivers/pinctrl/mvebu/pinctrl-kirkwood.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/pinctrl/mvebu/pinctrl-kirkwood.c b/drivers/pinctrl/mvebu/pinctrl-kirkwood.c
index 9a74ef6..fe885ca 100644
--- a/drivers/pinctrl/mvebu/pinctrl-kirkwood.c
+++ b/drivers/pinctrl/mvebu/pinctrl-kirkwood.c@@ -444,8 +444,11 @@ static struct of_device_id kirkwood_pinctrl_of_match[] __devinitdata = { static int __devinit kirkwood_pinctrl_probe(struct platform_device *pdev) { - const struct of_device_id *match = - of_match_device(kirkwood_pinctrl_of_match, &pdev->dev); + const struct of_device_id *match; + + match = of_match_device(kirkwood_pinctrl_of_match, &pdev->dev); + if (!match) + return -ENODEV; pdev->dev.platform_data = match->data; return mvebu_pinctrl_probe(pdev); }
--
1.7.9.5