diff options
| author | Doug Zobel <dzobel1@motorola.com> | 2013-11-15 14:29:07 -0600 |
|---|---|---|
| committer | James Wylder <jwylder@motorola.com> | 2014-03-05 17:46:52 -0600 |
| commit | d2a782003a6047da120a33e6f8ee6fd33bb825d6 (patch) | |
| tree | 8d20bd4ecda62a06e98993c4108456bc1acb0d0b /drivers/mfd/tps65912-core.c | |
| parent | 32fd2d36d2464056d4522a9c02797b7c2b2e884f (diff) | |
| download | olio-linux-3.10-d2a782003a6047da120a33e6f8ee6fd33bb825d6.tar.xz olio-linux-3.10-d2a782003a6047da120a33e6f8ee6fd33bb825d6.zip | |
CW integration and minnow bringup
* create minnow machine type
* create Android makefile
* add pre-commit syntax check
* enable -Werror
* Add drivers: CPCAP, TPS65xxx, m4sensorhub, atmxt, lm3535,
usb gadget, minnow display, TI 12xx wireless
Change-Id: I7962f5e1256715f2452aed5a62a4f2f2383d5046
Diffstat (limited to 'drivers/mfd/tps65912-core.c')
| -rw-r--r-- | drivers/mfd/tps65912-core.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/mfd/tps65912-core.c b/drivers/mfd/tps65912-core.c index aeb8e40ab42..dfd832d0aef 100644 --- a/drivers/mfd/tps65912-core.c +++ b/drivers/mfd/tps65912-core.c @@ -156,9 +156,17 @@ int tps65912_device_init(struct tps65912 *tps65912) if (ret < 0) goto err; +#ifdef CONFIG_MFD_TPS65912_DEBUGFS + ret = tps65912_debugfs_create(tps65912); + if (ret < 0) + goto err_debugfs; +#endif + kfree(init_data); return ret; +err_debugfs: + tps65912_irq_exit(tps65912); err: kfree(init_data); mfd_remove_devices(tps65912->dev); @@ -168,6 +176,9 @@ err: void tps65912_device_exit(struct tps65912 *tps65912) { +#ifdef CONFIG_MFD_TPS65912_DEBUGFS + tps65912_debugfs_remove(tps65912); +#endif mfd_remove_devices(tps65912->dev); tps65912_irq_exit(tps65912); kfree(tps65912); |