diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-09 20:26:31 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-09 20:26:31 +0400 |
| commit | c7abc19ca6d48392f91ca04ebe1e9813b3ace435 (patch) | |
| tree | c23540ea1425e9891b39cdff550e90caaba38163 /arch/arm/mach-pxa/spitz.c | |
| parent | d60990d597bfa2816dfe28a5c5c6787610b423e6 (diff) | |
| parent | c095ba7224d8edc71dcef0d655911399a8bd4a3f (diff) | |
| download | linux-c7abc19ca6d48392f91ca04ebe1e9813b3ace435.tar.xz | |
Merge tag 'v3.11-rc4' into spi-bitbang
Linux 3.11-rc4
Diffstat (limited to 'arch/arm/mach-pxa/spitz.c')
| -rw-r--r-- | arch/arm/mach-pxa/spitz.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 2125df0444e7..4c29173026e8 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c @@ -598,7 +598,7 @@ static inline void spitz_spi_init(void) {} * NOTE: The card detect interrupt isn't debounced so we delay it by 250ms to * give the card a chance to fully insert/eject. */ -static void spitz_mci_setpower(struct device *dev, unsigned int vdd) +static int spitz_mci_setpower(struct device *dev, unsigned int vdd) { struct pxamci_platform_data* p_d = dev->platform_data; @@ -606,6 +606,8 @@ static void spitz_mci_setpower(struct device *dev, unsigned int vdd) spitz_card_pwr_ctrl(SCOOP_CPR_SD_3V, SCOOP_CPR_SD_3V); else spitz_card_pwr_ctrl(SCOOP_CPR_SD_3V, 0x0); + + return 0; } static struct pxamci_platform_data spitz_mci_platform_data = { |