From 7a35805eac412e92b6f90cb6a3858403570f4533 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Sat, 2 Mar 2013 15:25:50 +0800 Subject: [PATCH] --- yaml --- r: 361320 b: refs/heads/master c: 80e4e6716e43500c5c7d4ff4f73fc1b56f024083 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mfd/tps65912-core.c | 1 + trunk/include/linux/mfd/tps65912.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 107fc74822af..7f9138097480 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df545d1cd01aab3ba3f687d5423e6c3687b069d8 +refs/heads/master: 80e4e6716e43500c5c7d4ff4f73fc1b56f024083 diff --git a/trunk/drivers/mfd/tps65912-core.c b/trunk/drivers/mfd/tps65912-core.c index 4658b5bdcd84..aeb8e40ab424 100644 --- a/trunk/drivers/mfd/tps65912-core.c +++ b/trunk/drivers/mfd/tps65912-core.c @@ -169,6 +169,7 @@ int tps65912_device_init(struct tps65912 *tps65912) void tps65912_device_exit(struct tps65912 *tps65912) { mfd_remove_devices(tps65912->dev); + tps65912_irq_exit(tps65912); kfree(tps65912); } diff --git a/trunk/include/linux/mfd/tps65912.h b/trunk/include/linux/mfd/tps65912.h index aaceab402ec5..6d309032dc0d 100644 --- a/trunk/include/linux/mfd/tps65912.h +++ b/trunk/include/linux/mfd/tps65912.h @@ -323,5 +323,6 @@ int tps65912_device_init(struct tps65912 *tps65912); void tps65912_device_exit(struct tps65912 *tps65912); int tps65912_irq_init(struct tps65912 *tps65912, int irq, struct tps65912_platform_data *pdata); +int tps65912_irq_exit(struct tps65912 *tps65912); #endif /* __LINUX_MFD_TPS65912_H */