]> err.no Git - linux-2.6/commitdiff
[PATCH] powerpc: remove warning in EEH code
authorOlof Johansson <olof@lixom.net>
Wed, 11 Jan 2006 20:02:58 +0000 (14:02 -0600)
committerPaul Mackerras <paulus@samba.org>
Thu, 12 Jan 2006 09:09:29 +0000 (20:09 +1100)
Remove warning in eeh code about mixed variables and code.

Signed-off-by: Olof Johansson <olof@lixom.net>
Acked-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/platforms/pseries/eeh.c

index 17cea7f2afd3a5dca0e918474ff83ea40fb05d6e..83578313ee7e7e635fb07663df1e64ab080dff94 100644 (file)
@@ -208,10 +208,11 @@ static void __eeh_mark_slot (struct device_node *dn, int mode_flag)
 {
        while (dn) {
                if (PCI_DN(dn)) {
-                       PCI_DN(dn)->eeh_mode |= mode_flag;
-
                        /* Mark the pci device driver too */
                        struct pci_dev *dev = PCI_DN(dn)->pcidev;
+
+                       PCI_DN(dn)->eeh_mode |= mode_flag;
+
                        if (dev && dev->driver)
                                dev->error_state = pci_channel_io_frozen;