summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-11 10:12:34 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-11 10:12:34 -0700
commitaf5b14c49aad13de1c8e9e1abfbabe127c3af92e (patch)
tree7c5ed428267236195ff4438406bcd8171ba4dab4 /drivers
parente4cb04074c5f5593f98ba2a89a011034f57604e4 (diff)
parente0cda54e4414e98f0bf72116d8522f4e434f6b4b (diff)
downloadop-kernel-dev-af5b14c49aad13de1c8e9e1abfbabe127c3af92e.zip
op-kernel-dev-af5b14c49aad13de1c8e9e1abfbabe127c3af92e.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: bug in AT91 MCI suspend routines
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/at91_mci.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
index bfebd2f..955ea60 100644
--- a/drivers/mmc/host/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
@@ -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)
OpenPOWER on IntegriCloud