From 6fb6af6dc9b2f99d2ef728eb3ba71d112479c9f1 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Tue, 23 Mar 2004 23:20:24 +0000
Subject: * 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
---
 cpu/mpc8260/traps.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cpu')

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;
 	}
-- 
cgit