From 3ec8e65f59f786860d68b3c58d58b7e40c7086c6 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 20 Jun 2011 11:47:55 +0100
Subject: [PATCH] --- yaml --- r: 261878 b: refs/heads/master c:
 ec2328c30bf09fe31e77889090eeb1a965325f53 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/mfd/tps65910.c       | 1 +
 trunk/include/linux/mfd/tps65910.h | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 41d1a064f069..8bb14100a108 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19921ef61217fff600202b819c05bb078f254619
+refs/heads/master: ec2328c30bf09fe31e77889090eeb1a965325f53
diff --git a/trunk/drivers/mfd/tps65910.c b/trunk/drivers/mfd/tps65910.c
index 2229e66d80db..837f0e6fbf0e 100644
--- a/trunk/drivers/mfd/tps65910.c
+++ b/trunk/drivers/mfd/tps65910.c
@@ -187,6 +187,7 @@ static int tps65910_i2c_remove(struct i2c_client *i2c)
 	struct tps65910 *tps65910 = i2c_get_clientdata(i2c);
 
 	mfd_remove_devices(tps65910->dev);
+	tps65910_irq_exit(tps65910);
 	kfree(tps65910);
 
 	return 0;
diff --git a/trunk/include/linux/mfd/tps65910.h b/trunk/include/linux/mfd/tps65910.h
index 73572c65d04f..82b4c8801a4f 100644
--- a/trunk/include/linux/mfd/tps65910.h
+++ b/trunk/include/linux/mfd/tps65910.h
@@ -791,6 +791,7 @@ int tps65910_clear_bits(struct tps65910 *tps65910, u8 reg, u8 mask);
 void tps65910_gpio_init(struct tps65910 *tps65910, int gpio_base);
 int tps65910_irq_init(struct tps65910 *tps65910, int irq,
 		struct tps65910_platform_data *pdata);
+int tps65910_irq_exit(struct tps65910 *tps65910);
 
 static inline int tps65910_chip_id(struct tps65910 *tps65910)
 {