diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-07-05 17:51:20 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-07-23 12:15:15 -0700 |
| commit | a829abf8daa2dcf8223a9284b76d221e61130e13 (patch) | |
| tree | 1adb4dfbecaf88fc6701d7148cd0743b0957e5c0 /arch/arm/mach-pxa/stargate2.c | |
| parent | fe08bf9f46d6ae8e08de32d29234a2c928eebf8f (diff) | |
| download | linux-a829abf8daa2dcf8223a9284b76d221e61130e13.tar.gz linux-a829abf8daa2dcf8223a9284b76d221e61130e13.tar.bz2 linux-a829abf8daa2dcf8223a9284b76d221e61130e13.zip | |
ARM: pxa: propagate errors from regulator_enable() to pxamci
The em_x270_mci_setpower() and em_x270_usb_hub_init() functions
call regulator_enable(), which may return an error that must
be checked.
This changes the em_x270_usb_hub_init() function to bail out
if it fails, and changes the pxamci_platform_data->setpower
callback so that the a failed em_x270_mci_setpower call
can be propagated by the pxamci driver into the mmc core.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Mike Rapoport <mike@compulab.co.il>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Acked-by: Chris Ball <cjb@laptop.org>
[olof: fixed order of regulator_enable() and test in em_x270_usb_hub_init]
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-pxa/stargate2.c')
| -rw-r--r-- | arch/arm/mach-pxa/stargate2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/stargate2.c b/arch/arm/mach-pxa/stargate2.c index 88fde43c948c..62aea3e835f3 100644 --- a/arch/arm/mach-pxa/stargate2.c +++ b/arch/arm/mach-pxa/stargate2.c @@ -734,9 +734,10 @@ static int stargate2_mci_init(struct device *dev, * * Very simple control. Either it is on or off and is controlled by * a gpio pin */ -static void stargate2_mci_setpower(struct device *dev, unsigned int vdd) +static int stargate2_mci_setpower(struct device *dev, unsigned int vdd) { gpio_set_value(SG2_SD_POWER_ENABLE, !!vdd); + return 0; } static void stargate2_mci_exit(struct device *dev, void *data) |