The patch titled
sata_nv: propagate ata_pci_device_do_resume return value
has been removed from the -mm tree. Its filename was
sata_nv-propagate-ata_pci_device_do_resume-return-value.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: sata_nv: propagate ata_pci_device_do_resume return value
From: Robert Hancock <hancockr@xxxxxxx>
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@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/ata/sata_nv.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff -puN drivers/ata/sata_nv.c~sata_nv-propagate-ata_pci_device_do_resume-return-value drivers/ata/sata_nv.c
--- a/drivers/ata/sata_nv.c~sata_nv-propagate-ata_pci_device_do_resume-return-value
+++ a/drivers/ata/sata_nv.c
@@ -1567,8 +1567,11 @@ static int nv_pci_device_resume(struct p
{
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) {
_
Patches currently in -mm which might be from hancockr@xxxxxxx are
git-libata-all.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
