aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorAlan <alan@lxorguk.ukuu.org.uk>2007-02-20 17:44:25 +0000
committerJeff Garzik <jeff@garzik.org>2007-02-21 04:58:20 -0500
commitaa6de4942c25f05cb7f4aa8efa20c5ec0884d8f1 (patch)
treea8cfa86d4ff27eb37079c51072fc5695c61ea7a3 /drivers/ata
parente852f7054df7cf4be686d8cff9c33333a36b59e9 (diff)
downloadkernel_samsung_smdk4412-aa6de4942c25f05cb7f4aa8efa20c5ec0884d8f1.zip
kernel_samsung_smdk4412-aa6de4942c25f05cb7f4aa8efa20c5ec0884d8f1.tar.gz
kernel_samsung_smdk4412-aa6de4942c25f05cb7f4aa8efa20c5ec0884d8f1.tar.bz2
pata_cs5520: suspend/resume
The CS5520 isn't just an ATA controller and we must not pci_disable_device it as it turns into pci_disable_computer. Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/pata_cs5520.c26
1 files changed, 25 insertions, 1 deletions
diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
index 1ce8fcf..b49d8b7 100644
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
@@ -325,6 +325,30 @@ static int cs5520_reinit_one(struct pci_dev *pdev)
pci_write_config_byte(pdev, 0x60, pcicfg | 0x40);
return ata_pci_device_resume(pdev);
}
+
+/**
+ * cs5520_pci_device_suspend - device suspend
+ * @pdev: PCI device
+ *
+ * We have to cut and waste bits from the standard method because
+ * the 5520 is a bit odd and not just a pure ATA device. As a result
+ * we must not disable it. The needed code is short and this avoids
+ * chip specific mess in the core code.
+ */
+
+static int cs5520_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;
+
+ pci_save_state(pdev);
+ return 0;
+}
+
/* For now keep DMA off. We can set it for all but A rev CS5510 once the
core ATA code can handle it */
@@ -340,7 +364,7 @@ static struct pci_driver cs5520_pci_driver = {
.id_table = pata_cs5520,
.probe = cs5520_init_one,
.remove = cs5520_remove_one,
- .suspend = ata_pci_device_suspend,
+ .suspend = cs5520_pci_device_suspend,
.resume = cs5520_reinit_one,
};