diff options
| author | Olof Johansson <olof@lixom.net> | 2006-01-11 14:02:58 -0600 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-01-12 20:09:29 +1100 |
| commit | ea183a957abea8e05530a4536a9c2db16e9fdd85 (patch) | |
| tree | de42ccabaaee30de5cfaa5c4064f9d96833dbe0e | |
| parent | 5388fb1025443ec223ba556b10efc4c5f83f8682 (diff) | |
| download | op-kernel-dev-ea183a957abea8e05530a4536a9c2db16e9fdd85.zip op-kernel-dev-ea183a957abea8e05530a4536a9c2db16e9fdd85.tar.gz | |
[PATCH] powerpc: remove warning in EEH code
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>
| -rw-r--r-- | arch/powerpc/platforms/pseries/eeh.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c index 17cea7f..8357831 100644 --- a/arch/powerpc/platforms/pseries/eeh.c +++ b/arch/powerpc/platforms/pseries/eeh.c @@ -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; |
