diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-21 19:07:34 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-21 19:07:34 -0400 |
| commit | 23a376f98c5dcfc392d47e8d1872884ff44e585d (patch) | |
| tree | dbe476151bbd6530369c40746f2ec2365f7b500a /drivers/mfd/tps65912-core.c | |
| parent | 8358f6242dd447a4f694c7bc949bbfc842ca5db1 (diff) | |
| parent | a937536b868b8369b98967929045f1df54234323 (diff) | |
Merge 3.9-rc3 into tty-next
Diffstat (limited to 'drivers/mfd/tps65912-core.c')
| -rw-r--r-- | drivers/mfd/tps65912-core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/tps65912-core.c b/drivers/mfd/tps65912-core.c index 4658b5bdcd84..aeb8e40ab424 100644 --- a/drivers/mfd/tps65912-core.c +++ b/drivers/mfd/tps65912-core.c | |||
| @@ -169,6 +169,7 @@ err: | |||
| 169 | void tps65912_device_exit(struct tps65912 *tps65912) | 169 | void tps65912_device_exit(struct tps65912 *tps65912) |
| 170 | { | 170 | { |
| 171 | mfd_remove_devices(tps65912->dev); | 171 | mfd_remove_devices(tps65912->dev); |
| 172 | tps65912_irq_exit(tps65912); | ||
| 172 | kfree(tps65912); | 173 | kfree(tps65912); |
| 173 | } | 174 | } |
| 174 | 175 | ||