diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-12-03 20:32:13 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2009-12-03 16:12:35 -0500 |
| commit | 0826ef5f6fa28c50b70cfae001fd31531a1656f8 (patch) | |
| tree | 2b77461b45b47b57dba2c769df7520d515c87000 /drivers/ata | |
| parent | dd4a43c979d5da7f2cd20e2751dbbd841116cdfe (diff) | |
| download | blackbird-obmc-linux-0826ef5f6fa28c50b70cfae001fd31531a1656f8.tar.gz blackbird-obmc-linux-0826ef5f6fa28c50b70cfae001fd31531a1656f8.zip | |
pata_rz1000: Power Management fix
Fix ->resume method to re-enable & re-init PCI device properly
before doing chipset specific setup.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/pata_rz1000.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/ata/pata_rz1000.c b/drivers/ata/pata_rz1000.c index a5e4dfe60b41..2932998fc4c6 100644 --- a/drivers/ata/pata_rz1000.c +++ b/drivers/ata/pata_rz1000.c @@ -105,11 +105,20 @@ static int rz1000_init_one (struct pci_dev *pdev, const struct pci_device_id *en #ifdef CONFIG_PM static int rz1000_reinit_one(struct pci_dev *pdev) { + struct ata_host *host = dev_get_drvdata(&pdev->dev); + int rc; + + rc = ata_pci_device_do_resume(pdev); + if (rc) + return rc; + /* If this fails on resume (which is a "cant happen" case), we must stop as any progress risks data loss */ if (rz1000_fifo_disable(pdev)) panic("rz1000 fifo"); - return ata_pci_device_resume(pdev); + + ata_host_resume(host); + return 0; } #endif |
