Skip to content
Permalink
Browse files

pinctrl: sirf: fix a bad conflict resolution

Commit 294d135
"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>
  • Loading branch information...
linusw committed May 30, 2014
1 parent 697787a commit 29c7f1f53bfb3770bdb65a9e79064a963dd40621
Showing with 1 addition and 1 deletion.
  1. +1 −1 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;
}

0 comments on commit 29c7f1f

Please sign in to comment.
You can’t perform that action at this time.