diff options
author | Johan Hovold <jhovold@gmail.com> | 2011-08-15 06:42:03 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-09-06 10:37:59 -0400 |
commit | fa948761e685fb03823b3029e5b6bdb52229d6ce (patch) | |
tree | ab161a6c89ad4c49ef57ca9edc9c6a258509817b /drivers/mfd | |
parent | d0e84caeb4cd535923884735906e5730329505b4 (diff) |
mfd: Fix initialisation of tps65910 interrupts
Fix regression introduced by commit
a2974732ca7614aaf0baf9d6dd3ad893d50ce1c5 (TPS65911: Add new irq
definitions) which caused irq_num to be incorrectly set for tps65910.
Cc: stable@kernel.org
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Acked-by: Graeme Gregory <gg@slimlogic.co.uk>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/tps65910-irq.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mfd/tps65910-irq.c b/drivers/mfd/tps65910-irq.c index 2bfad5c86cc7..a56be931551c 100644 --- a/drivers/mfd/tps65910-irq.c +++ b/drivers/mfd/tps65910-irq.c | |||
@@ -178,8 +178,10 @@ int tps65910_irq_init(struct tps65910 *tps65910, int irq, | |||
178 | switch (tps65910_chip_id(tps65910)) { | 178 | switch (tps65910_chip_id(tps65910)) { |
179 | case TPS65910: | 179 | case TPS65910: |
180 | tps65910->irq_num = TPS65910_NUM_IRQ; | 180 | tps65910->irq_num = TPS65910_NUM_IRQ; |
181 | break; | ||
181 | case TPS65911: | 182 | case TPS65911: |
182 | tps65910->irq_num = TPS65911_NUM_IRQ; | 183 | tps65910->irq_num = TPS65911_NUM_IRQ; |
184 | break; | ||
183 | } | 185 | } |
184 | 186 | ||
185 | /* Register with genirq */ | 187 | /* Register with genirq */ |