diff options
| author | Johan Hovold <jhovold@gmail.com> | 2011-08-15 12:42:03 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 11:40:27 -0700 |
| commit | fbb3afe05e2664dd265b002a4c0992c45bb885a7 (patch) | |
| tree | af9acc2b6b19343174eda7601abfc094e071e6a6 /drivers/mfd | |
| parent | 7edcab441920647c6ffec304451e11bc18ff1b11 (diff) | |
| download | kernel_samsung_smdk4412-fbb3afe05e2664dd265b002a4c0992c45bb885a7.zip kernel_samsung_smdk4412-fbb3afe05e2664dd265b002a4c0992c45bb885a7.tar.gz kernel_samsung_smdk4412-fbb3afe05e2664dd265b002a4c0992c45bb885a7.tar.bz2 | |
mfd: Fix initialisation of tps65910 interrupts
commit fa948761e685fb03823b3029e5b6bdb52229d6ce upstream.
Fix regression introduced by commit
a2974732ca7614aaf0baf9d6dd3ad893d50ce1c5 (TPS65911: Add new irq
definitions) which caused irq_num to be incorrectly set for tps65910.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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 2bfad5c..a56be93 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, switch (tps65910_chip_id(tps65910)) { case TPS65910: tps65910->irq_num = TPS65910_NUM_IRQ; + break; case TPS65911: tps65910->irq_num = TPS65911_NUM_IRQ; + break; } /* Register with genirq */ |