Skip to contentSkip to conversation

mmc: sdhci: add regulator disable/put when control error

PATCH In review Jaehoon Chung 3 participants 4 messages Apr 5, 2011 – Apr 9, 2011

Subsystems (2)
MMC, SD and SDIO Secure digital host controller interface (SDHCI) driver
lore
Share & tools
lore

Jaehoon Chung

author
#0 lore raw

PATCH v3 2/2 mmc: sdhci: add regulator disable/put when control error

Missing regulator disable/put. Fixed them.

Signed-off-by Jaehoon Chung <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
---
 drivers/mmc/host/sdhci.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
drivers/mmc/host/sdhci.c +4 -0
index 1768ffb..35edcc1 100644
@@ -2048,6 +2048,10 @@ reset:
 	sdhci_reset(host, SDHCI_RESET_ALL);
 	free_irq(host->irq, host);
 	del_timer_sync(&host->timer);
+	if (host->vmmc) {
+		regulator_disable(host->vmmc);
+		regulator_put(host->vmmc);
+	}
 
 untasklet:
 	tasklet_kill(&host->card_tasklet);
#2 lore raw

Hi..

2011/4/9 Wolfram Sang <[email protected]>:

Quoted 7 lines · Jaehoon Chung
Quoted 4 lines

Missing regulator disable/put. Fixed them.

Signed-off-by Jaehoon Chung <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>

Looks OK but could be merged into the previous patch.

Thanks. :)
yes, i can be merged into the previous patch.
But i think good that separeted. anyway..don't mind merged or not?

Regards,
Jaehoon Chung

Quoted 14 lines

--
Pengutronix e.K.                           | Wolfram Sang                | Industrial Linux Solutions                 | http://www.pengutronix.de/  |

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAk2fViEACgkQD27XaX1/VRt1+wCaAxSjsZ+GqVdhnca16rMsO7LK jfcAnjvIvSBSFknx7nMomkT6I4Y1YTgV
=KfuE
-----END PGP SIGNATURE-----

#3 lore raw
Quoted 5 lines
Quoted 1 line

Looks OK but could be merged into the previous patch.

Thanks. :)
yes, i can be merged into the previous patch.
But i think good that separeted. anyway..don't mind merged or not?

I prefer it merged, because it then fixes all forgotten cleanups in the error-path in one go.

Signature · 2 lines
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |