From: Anton Vorontsov <anton@enomsg.org>
Date: Tue, 19 Mar 2013 02:02:58 +0000 (-0700)
Subject: Merge branch 'for-mfd-and-power' of git://git.linaro.org/people/ljones/linux-3.0... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=441a499e5a5bf7b65ca557abd5ffc64b509dca65;p=linux-beck.git

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

From Lee Jones <lee.jones@linaro.org>:

"Please find the next instalment of the AB8500 Power drivers upgrade. A lot of
work has taken place on the internal development track, but little effort has
gone into mainlining it. There is a large backlog of patches which are in need
of forward-porting, then upstreaming. This patch-set aims to make a large dent
into them."

Conflicts:
	drivers/mfd/ab8500-gpadc.c
---

441a499e5a5bf7b65ca557abd5ffc64b509dca65
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;