From: David Gibson <david@gibson.dropbear.id.au>
Date: Wed, 3 Jun 2015 04:52:59 +0000 (+1000)
Subject: powerpc/eeh: Fix trivial error in eeh_restore_dev_state()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=502f159c0239863deebfc50e09c0892d0c157101;p=deliverable%2Flinux.git

powerpc/eeh: Fix trivial error in eeh_restore_dev_state()

Commit 28158cd "powerpc/eeh: Enhance pcibios_set_pcie_reset_state()"
introduced a fix for a problem where certain configurations could lead to
pci_reset_function() destroying the state of PCI devices other than the one
specified.

Unfortunately, the fix has a trivial bug - it calls pci_save_state() again,
when it should be calling pci_restore_state().  This corrects the problem.

Cc: Gavin Shan <gwshan@au1.ibm.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---

diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
index 23e0aa773643..51dcdf66e9e6 100644
--- a/arch/powerpc/kernel/eeh.c
+++ b/arch/powerpc/kernel/eeh.c
@@ -717,7 +717,7 @@ static void *eeh_restore_dev_state(void *data, void *userdata)
 
 	/* The caller should restore state for the specified device */
 	if (pdev != dev)
-		pci_save_state(pdev);
+		pci_restore_state(pdev);
 
 	return NULL;
 }