diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-15 10:19:52 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-15 10:19:52 (GMT) |
| commit | 4210606b19852dce52ed1a687db816695b6048e1 (patch) | |
| tree | fd0762f88dc54560d87fc1e523741d92228f6a9c /arch/arm/mach-pxa/mainstone.c | |
| parent | 4d8cfa4642f7d8fafa4d60f05dd34fe8c3b9fa45 (diff) | |
| parent | b7ae6f31d8243ec684af16bc5c763eccdfabaec0 (diff) | |
| download | linux-fsl-qoriq-4210606b19852dce52ed1a687db816695b6048e1.tar.xz | |
Merge branch 'topic/dma' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-pxa
Diffstat (limited to 'arch/arm/mach-pxa/mainstone.c')
| -rw-r--r-- | arch/arm/mach-pxa/mainstone.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c index d2c6523..dd70343 100644 --- a/arch/arm/mach-pxa/mainstone.c +++ b/arch/arm/mach-pxa/mainstone.c @@ -408,7 +408,7 @@ static int mainstone_mci_init(struct device *dev, irq_handler_t mstone_detect_in return err; } -static void mainstone_mci_setpower(struct device *dev, unsigned int vdd) +static int mainstone_mci_setpower(struct device *dev, unsigned int vdd) { struct pxamci_platform_data* p_d = dev->platform_data; @@ -420,6 +420,7 @@ static void mainstone_mci_setpower(struct device *dev, unsigned int vdd) printk(KERN_DEBUG "%s: off\n", __func__); MST_MSCWR1 &= ~MST_MSCWR1_MMC_ON; } + return 0; } static void mainstone_mci_exit(struct device *dev, void *data) |