]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
pinctrl: imx: make sure, imx_find_pin_reg() returns NULL when pin is not found pinctrl-bugfix kc/pinctrl-bugfix
authorLothar Waßmann <LW@KARO-electronics.de>
Thu, 22 Nov 2012 08:55:25 +0000 (09:55 +0100)
committerLothar Waßmann <LW@KARO-electronics.de>
Thu, 22 Nov 2012 08:55:25 +0000 (09:55 +0100)
drivers/pinctrl/pinctrl-imx.c

index f3d2384b34bfb4a4c652606b460ecf9398734628..a11de5ea8949a08870d6241a23848cad51858a47 100644 (file)
@@ -62,13 +62,16 @@ static const struct imx_pin_reg *imx_find_pin_reg(
        int i;
 
        for (i = 0; i < info->npin_regs; i++) {
-               pin_reg = &info->pin_regs[i];
-               if (pin_reg->pid != pin)
+               const struct imx_pin_reg *pr = &info->pin_regs[i];
+               if (pr->pid != pin)
                        continue;
-               if (!is_mux)
+               if (!is_mux) {
+                       pin_reg = pr;
                        break;
-               else if (pin_reg->mux_mode == (mux & IMX_MUX_MASK))
+               } else if (pr->mux_mode == (mux & IMX_MUX_MASK)) {
+                       pin_reg = pr;
                        break;
+               }
        }
 
        if (!pin_reg) {