diff options
Diffstat (limited to 'drivers/mmc/host/cb710-mmc.c')
-rw-r--r-- | drivers/mmc/host/cb710-mmc.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/mmc/host/cb710-mmc.c b/drivers/mmc/host/cb710-mmc.c index 9d6e2b844404..1087b4c79cd6 100644 --- a/drivers/mmc/host/cb710-mmc.c +++ b/drivers/mmc/host/cb710-mmc.c | |||
@@ -667,12 +667,6 @@ static const struct mmc_host_ops cb710_mmc_host = { | |||
667 | static int cb710_mmc_suspend(struct platform_device *pdev, pm_message_t state) | 667 | static int cb710_mmc_suspend(struct platform_device *pdev, pm_message_t state) |
668 | { | 668 | { |
669 | struct cb710_slot *slot = cb710_pdev_to_slot(pdev); | 669 | struct cb710_slot *slot = cb710_pdev_to_slot(pdev); |
670 | struct mmc_host *mmc = cb710_slot_to_mmc(slot); | ||
671 | int err; | ||
672 | |||
673 | err = mmc_suspend_host(mmc); | ||
674 | if (err) | ||
675 | return err; | ||
676 | 670 | ||
677 | cb710_mmc_enable_irq(slot, 0, ~0); | 671 | cb710_mmc_enable_irq(slot, 0, ~0); |
678 | return 0; | 672 | return 0; |
@@ -681,11 +675,9 @@ static int cb710_mmc_suspend(struct platform_device *pdev, pm_message_t state) | |||
681 | static int cb710_mmc_resume(struct platform_device *pdev) | 675 | static int cb710_mmc_resume(struct platform_device *pdev) |
682 | { | 676 | { |
683 | struct cb710_slot *slot = cb710_pdev_to_slot(pdev); | 677 | struct cb710_slot *slot = cb710_pdev_to_slot(pdev); |
684 | struct mmc_host *mmc = cb710_slot_to_mmc(slot); | ||
685 | 678 | ||
686 | cb710_mmc_enable_irq(slot, 0, ~0); | 679 | cb710_mmc_enable_irq(slot, 0, ~0); |
687 | 680 | return 0; | |
688 | return mmc_resume_host(mmc); | ||
689 | } | 681 | } |
690 | 682 | ||
691 | #endif /* CONFIG_PM */ | 683 | #endif /* CONFIG_PM */ |