pinctrl: nomadik: Prevent NULL dereference if of_match_device returns NULL
of_match_device() may return NULL. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
e7ed671825
commit
953e9e9386
|
@ -1864,9 +1864,14 @@ static int __devinit nmk_pinctrl_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
if (platid)
|
if (platid)
|
||||||
version = platid->driver_data;
|
version = platid->driver_data;
|
||||||
else if (np)
|
else if (np) {
|
||||||
version = (unsigned int)
|
const struct of_device_id *match;
|
||||||
of_match_device(nmk_pinctrl_match, &pdev->dev)->data;
|
|
||||||
|
match = of_match_device(nmk_pinctrl_match, &pdev->dev);
|
||||||
|
if (!match)
|
||||||
|
return -ENODEV;
|
||||||
|
version = (unsigned int) match->data;
|
||||||
|
}
|
||||||
|
|
||||||
/* Poke in other ASIC variants here */
|
/* Poke in other ASIC variants here */
|
||||||
if (version == PINCTRL_NMK_STN8815)
|
if (version == PINCTRL_NMK_STN8815)
|
||||||
|
|
Loading…
Reference in a new issue