diff options
| author | Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz> | 2011-05-15 22:33:19 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2011-05-19 20:46:40 -0400 |
| commit | bfeec8ca15c9c06c1978a25248e2bd11c4a26d72 (patch) | |
| tree | 433899d620fbb5542ced276e7b467d915ccf2e64 /drivers/ata | |
| parent | 5f4e206666f834340b69ddb43f86de3851c8675a (diff) | |
| download | linux-stable-bfeec8ca15c9c06c1978a25248e2bd11c4a26d72.tar.gz linux-stable-bfeec8ca15c9c06c1978a25248e2bd11c4a26d72.tar.bz2 linux-stable-bfeec8ca15c9c06c1978a25248e2bd11c4a26d72.zip | |
ATA: Don't powerdown Compaq Triflex IDE device on suspend
Don't powerdown Compaq Triflex IDE device on suspend
This fixes APM suspend on Compaq Armada 7400.
APM BIOS doesn't suspend if IDE is powered down when suspending.
The Triflex controller is found only on old Compaq boards,
so this patch will hopefully have no side effects.
Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/pata_triflex.c | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c index 03b6d69d6197..b3e0c9432283 100644 --- a/drivers/ata/pata_triflex.c +++ b/drivers/ata/pata_triflex.c @@ -210,13 +210,34 @@ static const struct pci_device_id triflex[] = { { }, }; +#ifdef CONFIG_PM +static int triflex_ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg) +{ + struct ata_host *host = dev_get_drvdata(&pdev->dev); + int rc = 0; + + rc = ata_host_suspend(host, mesg); + if (rc) + return rc; + + /* + * We must not disable or powerdown the device. + * APM bios refuses to suspend if IDE is not accessible. + */ + pci_save_state(pdev); + + return 0; +} + +#endif + static struct pci_driver triflex_pci_driver = { .name = DRV_NAME, .id_table = triflex, .probe = triflex_init_one, .remove = ata_pci_remove_one, #ifdef CONFIG_PM - .suspend = ata_pci_device_suspend, + .suspend = triflex_ata_pci_device_suspend, .resume = ata_pci_device_resume, #endif }; |