Commit ce053fa8 authored by Robert Hancock's avatar Robert Hancock Committed by Jeff Garzik

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: default avatarRobert Hancock <[email protected]>
Signed-off-by: default avatarAndrew Morton <[email protected]>
Signed-off-by: default avatarJeff Garzik <[email protected]>
parent a2cfe81a
......@@ -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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment