From: Samuel Ortiz <sameo@linux.intel.com>
Date: Mon, 8 Apr 2013 09:19:40 +0000 (+0200)
Subject: Merge branch 'for-mfd-and-power' of git://git.linaro.org/people/ljones/linux-3.0... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8b5fd8516cfdd187f35c45f5f818da94aa3b42e9;p=deliverable%2Flinux.git

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

Conflicts:
	drivers/mfd/ab8500-gpadc.c

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---

8b5fd8516cfdd187f35c45f5f818da94aa3b42e9
diff --cc drivers/mfd/ab8500-gpadc.c
index 5f341a50ee5a,af1db2a45e86..65f72284185d
--- a/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;