diff options
author | Pierre Ossman <drzeus@drzeus.cx> | 2007-03-06 13:38:49 +0100 |
---|---|---|
committer | Pierre Ossman <drzeus@drzeus.cx> | 2007-03-06 13:38:49 +0100 |
commit | a715dfc7b9ef15ed5b398b185bd84cc015ff37f6 (patch) | |
tree | b2aa0f57700fef3c7273b6dfd9194643e032b10b /drivers/mmc | |
parent | 62df67a523acd7a22d936bf946b1889dbd60ca98 (diff) | |
download | linux-stable-a715dfc7b9ef15ed5b398b185bd84cc015ff37f6.tar.gz linux-stable-a715dfc7b9ef15ed5b398b185bd84cc015ff37f6.tar.bz2 linux-stable-a715dfc7b9ef15ed5b398b185bd84cc015ff37f6.zip |
sdhci: release irq during suspend
Release the device's irq during sleep, as all well-behaved drivers
should.
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/sdhci.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index f3260ec61fe9..d749f08601b8 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -1079,6 +1079,13 @@ static int sdhci_suspend (struct pci_dev *pdev, pm_message_t state) pci_save_state(pdev); pci_enable_wake(pdev, pci_choose_state(pdev, state), 0); + + for (i = 0;i < chip->num_slots;i++) { + if (!chip->hosts[i]) + continue; + free_irq(chip->hosts[i]->irq, chip->hosts[i]); + } + pci_disable_device(pdev); pci_set_power_state(pdev, pci_choose_state(pdev, state)); @@ -1107,6 +1114,11 @@ static int sdhci_resume (struct pci_dev *pdev) continue; if (chip->hosts[i]->flags & SDHCI_USE_DMA) pci_set_master(pdev); + ret = request_irq(chip->hosts[i]->irq, sdhci_irq, + IRQF_SHARED, chip->hosts[i]->slot_descr, + chip->hosts[i]); + if (ret) + return ret; sdhci_init(chip->hosts[i]); mmiowb(); ret = mmc_resume_host(chip->hosts[i]->mmc); |