pinctrl: sirf: fix a bad conflict resolution

Commit 294d1351ff47726f0f110b88e816cbafe89512fb
"pinctrl: sirf: switch to using allocated state container"
caused a build conflict due to a bad conflict resolution
when cherry-picking the patch. Fix it up.

Cc: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/sirf/pinctrl-sirf.c b/drivers/pinctrl/sirf/pinctrl-sirf.c
index 0e83521..014f5b1 100644 (file)
--- a/drivers/pinctrl/sirf/pinctrl-sirf.c
+++ b/drivers/pinctrl/sirf/pinctrl-sirf.c
@@ -575,7 +575,7 @@ static void sirfsoc_gpio_handle_irq(unsigned int irq, struct irq_desc *desc)
        int i;
 
        for (i = 0; i < SIRFSOC_GPIO_NO_OF_BANKS; i++) {
-               bank = &sgpio_chip.sgpio_bank[i];
+               bank = &sgpio->sgpio_bank[i];
                if (bank->parent_irq == irq)
                        break;
        }