Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5aea408d authored by Dmitriy Monakhov's avatar Dmitriy Monakhov Committed by Jeff Garzik
Browse files

libata: handle ata_pci_device_do_resume() failure while resuming 



Since commit:553c4aa6
ata_pci_device_do_resume() can return error code, all callers was updated
except this one.

Signed-off-by: default avatarMonakhov Dmitriy <dmonakhov@openvz.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 8343f889

drivers/ata/sata_inic162x.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -642,7 +642,9 @@ static int inic_pci_device_resume(struct pci_dev *pdev) 
	void __iomem *mmio_base = host->iomap[MMIO_BAR];

	void __iomem *mmio_base = host->iomap[MMIO_BAR];

	int rc;

	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 (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) {

		rc = init_controller(mmio_base, hpriv->cached_hctl);

		rc = init_controller(mmio_base, hpriv->cached_hctl);