Merge branch 'for-mfd-and-power' of git://git.linaro.org/people/ljones/linux-3.0...

Conflicts:
	drivers/mfd/ab8500-gpadc.c

Signed-off-by: Samuel Ortiz <[email protected]>

diff --cc drivers/mfd/ab8500-gpadc.c
index 5f341a50ee5a5783e6e84118124e9efcfe177bd3,af1db2a45e8624319d47fbaa57635b156d4b0cb0..65f72284185d9cbf2d9eff0125015c7557fd119a
--- 1/drivers/mfd/ab8500-gpadc.c
--- 2/drivers/mfd/ab8500-gpadc.c
+++ b/drivers/mfd/ab8500-gpadc.c
@@@ -669,11 -987,12 +994,13 @@@ static int ab8500_gpadc_probe(struct pl
        ab8500_gpadc_read_calibration_data(gpadc);
        list_add_tail(&gpadc->node, &ab8500_gpadc_list);
        dev_dbg(gpadc->dev, "probe success\n");
+ 
        return 0;
  
 +fail_enable:
  fail_irq:
-       free_irq(gpadc->irq, gpadc);
+       free_irq(gpadc->irq_sw, gpadc);
+       free_irq(gpadc->irq_hw, gpadc);
  fail:
        kfree(gpadc);
        gpadc = NULL;