Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit fa948761e685fb03823b3029e5b6bdb52229d6ce

Authored by Johan Hovold
Committed by Samuel Ortiz
1 parent d0e84caeb4
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff

drivers/mfd/tps65910-irq.c
Diff comments   View file @ fa94876
... ... @@ -178,8 +178,10 @@
178 178 switch (tps65910_chip_id(tps65910)) {
179 179 case TPS65910:
180 180 tps65910->irq_num = TPS65910_NUM_IRQ;
  181 + break;
181 182 case TPS65911:
182 183 tps65910->irq_num = TPS65911_NUM_IRQ;
  184 + break;
183 185 }
184 186  
185 187 /* Register with genirq */