diff options
| author | Robert Richter <robert.richter@amd.com> | 2011-11-08 18:52:15 +0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2011-11-08 18:52:15 +0400 |
| commit | de346b6949063aa040ef607943b072835294f4b3 (patch) | |
| tree | 11f5a10b9ab41a10ea26bf8ab1f133b802e7559e /arch/arm/plat-s5p/irq-gpioint.c | |
| parent | dcfce4a095932e6e95d83ad982be3609947963bc (diff) | |
| parent | 9c48f1c629ecfa114850c03f875c6691003214de (diff) | |
| download | linux-de346b6949063aa040ef607943b072835294f4b3.tar.xz | |
Merge branch 'perf/core' into oprofile/master
Merge reason: Resolve conflicts with Don's NMI rework:
commit 9c48f1c629ecfa114850c03f875c6691003214de
Author: Don Zickus <dzickus@redhat.com>
Date: Fri Sep 30 15:06:21 2011 -0400
x86, nmi: Wire up NMI handlers to new routines
Conflicts:
arch/x86/oprofile/nmi_timer_int.c
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'arch/arm/plat-s5p/irq-gpioint.c')
| -rw-r--r-- | arch/arm/plat-s5p/irq-gpioint.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/plat-s5p/irq-gpioint.c b/arch/arm/plat-s5p/irq-gpioint.c index f71078ef6bb5..f88216d23991 100644 --- a/arch/arm/plat-s5p/irq-gpioint.c +++ b/arch/arm/plat-s5p/irq-gpioint.c @@ -114,17 +114,18 @@ static __init int s5p_gpioint_add(struct s3c_gpio_chip *chip) { static int used_gpioint_groups = 0; int group = chip->group; - struct s5p_gpioint_bank *bank = NULL; + struct s5p_gpioint_bank *b, *bank = NULL; struct irq_chip_generic *gc; struct irq_chip_type *ct; if (used_gpioint_groups >= S5P_GPIOINT_GROUP_COUNT) return -ENOMEM; - list_for_each_entry(bank, &banks, list) { - if (group >= bank->start && - group < bank->start + bank->nr_groups) + list_for_each_entry(b, &banks, list) { + if (group >= b->start && group < b->start + b->nr_groups) { + bank = b; break; + } } if (!bank) return -EINVAL; |