summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-03-23 23:20:24 +0000
committerwdenk <wdenk>2004-03-23 23:20:24 +0000
commit6fb6af6dc9b2f99d2ef728eb3ba71d112479c9f1 (patch)
treec984d6e17157fb9400abc0c50e4e5ac19eb4316d /cpu
parenteeb1b77b7d994b2fde385d5b90bb1abfc0ba3bee (diff)
* Patch by Stephen Williams, 19 March 2004
Increase speed of sector reads from SystemACE, shorten poll timeout and remove a useless reset * Patch by Tolunay Orkun, 19 Mar 2004: Make GigE PHY 1000Mbps Speed/Duplex detection conditional (CONFIG_PHY_GIGE) * Patch by Brad Kemp, 18 Mar 2004: prevent machine checks during a PCI scan * Patch by Pierre Aubert, 18 Mar 2004: Fix string cleaning in IDE identification
Diffstat (limited to 'cpu')
-rw-r--r--cpu/mpc8260/traps.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/mpc8260/traps.c b/cpu/mpc8260/traps.c
index 715ef60069..0c39e434ed 100644
--- a/cpu/mpc8260/traps.c
+++ b/cpu/mpc8260/traps.c
@@ -140,7 +140,7 @@ MachineCheckException(struct pt_regs *regs)
dump_pci();
#endif
/* clear the error in the error status register */
- if(immap->im_pci.pci_esr && cpu_to_le32(PCI_ERROR_PCI_NO_RSP)) {
+ if(immap->im_pci.pci_esr & cpu_to_le32(PCI_ERROR_PCI_NO_RSP)) {
immap->im_pci.pci_esr = cpu_to_le32(PCI_ERROR_PCI_NO_RSP);
return;
}