forked from luck/tmp_suning_uos_patched
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>
This commit is contained in:
parent
a2cfe81a59
commit
ce053fa8b5
|
@ -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) {
|
||||
|
|
Loading…
Reference in New Issue
Block a user