MMC updates
Subsystems (2)
Linus, please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git for-linus
to receive the following updates:
drivers/mmc/host/at91_mci.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
Anti Sullin (1):
bug in AT91 MCI suspend routines
drivers/mmc/host/at91_mci.c +3 -3
@@ -941,7 +941,7 @@ static int __exit at91_mci_remove(struct platform_device *pdev) host =mmc_priv (mmc); -if (host->present !=-1 ) { +if (host->board->det_pin) {device_init_wakeup (&pdev->dev,0 );free_irq (host->board->det_pin, host);cancel_delayed_work (&host->mmc->detect);
@@ -972,7 +972,7 @@ static int at91_mci_suspend(struct platform_device *pdev, pm_message_t state)struct at91mci_host *host =mmc_priv (mmc);int ret =0 ; -if (device_may_wakeup (&pdev->dev)) +if (host->board->det_pin &&device_may_wakeup (&pdev->dev))enable_irq_wake (host->board->det_pin);if (mmc)
@@ -987,7 +987,7 @@ static int at91_mci_resume(struct platform_device *pdev)struct at91mci_host *host =mmc_priv (mmc);int ret =0 ; -if (device_may_wakeup (&pdev->dev)) +if (host->board->det_pin &&device_may_wakeup (&pdev->dev))disable_irq_wake (host->board->det_pin);if (mmc)
Signature · 5 lines
-- Pierre Ossman Linux kernel, MMC maintainer http://www.kernel.org PulseAudio, core developer http://pulseaudio.org rdesktop, core developer http://www.rdesktop.org