Commit ce053fa8 authored Feb 05, 2007 by Robert Hancock Committed by Jeff Garzik Feb 09, 2007

sata_nv: propagate ata_pci_device_do_resume return value

ata_pci_device_do_resume can fail if the PCI device couldn't be re-enabled.
Update sata_nv to propagate the return value from this call and to not try
to do any other resume activities if it fails. Fixes a compile warning.

Signed-off-by: Robert Hancock <hancockr@shaw.ca>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

parent a2cfe81a

drivers/ata/sata_nv.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1575,8 +1575,11 @@ static int nv_pci_device_resume(struct pci_dev *pdev)
		{
		struct ata_host *host = dev_get_drvdata(&pdev->dev);
		struct nv_host_priv *hpriv = host->private_data;
		int rc;

		ata_pci_device_do_resume(pdev);
		rc = ata_pci_device_do_resume(pdev);
		if(rc)
		return rc;

		if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) {
		if(hpriv->type >= CK804) {