Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci Revert 1.12, it cause problems on promise contro...



details:   https://anonhg.NetBSD.org/src/rev/11e3f1f51f7e
branches:  trunk
changeset: 569558:11e3f1f51f7e
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Mon Aug 23 21:30:35 2004 +0000

description:
Revert 1.12, it cause problems on promise controllers, as reported in
PR kern/26568 by Paul Shupak.

diffstat:

 sys/dev/pci/pdcide.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (25 lines):

diff -r 2755af6d4eb7 -r 11e3f1f51f7e sys/dev/pci/pdcide.c
--- a/sys/dev/pci/pdcide.c      Mon Aug 23 20:55:03 2004 +0000
+++ b/sys/dev/pci/pdcide.c      Mon Aug 23 21:30:35 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pdcide.c,v 1.18 2004/08/21 00:28:34 thorpej Exp $      */
+/*     $NetBSD: pdcide.c,v 1.19 2004/08/23 21:30:35 bouyer Exp $       */
 
 /*
  * Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -509,11 +509,11 @@
                        continue;
                if (scr & PDC2xx_SCR_INT(i)) {
                        crv = wdcintr(wdc_cp);
-                       if (crv == 0) {
+                       if (crv == 0)
                                printf("%s:%d: bogus intr (reg 0x%x)\n",
-                                   sc->sc_wdcdev.sc_atac.atac_dev.dv_xname, i, scr);
-                               pciide_irqack(wdc_cp);
-                       } else
+                                   sc->sc_wdcdev.sc_atac.atac_dev.dv_xname,
+                                   i, scr);
+                       else
                                rv = 1;
                }
        }



Home | Main Index | Thread Index | Old Index