1 files changed, 8 insertions, 3 deletions

diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c
index 6a95d0438b6a..98c088ae7f4a 100644
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@ -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)