Source-Changes-HG archive

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

[src/netbsd-1-5]: src/sys/dev/ic Fix the previous pullup; I botched the patch.



details:   https://anonhg.NetBSD.org/src/rev/1c36db6c0a9d
branches:  netbsd-1-5
changeset: 488796:1c36db6c0a9d
user:      scw <scw%NetBSD.org@localhost>
date:      Sat Jul 29 17:23:16 2000 +0000

description:
Fix the previous pullup; I botched the patch.
Approved by: thorpej and jhawk

diffstat:

 sys/dev/ic/clmpcc.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 81a07d54d7b2 -r 1c36db6c0a9d sys/dev/ic/clmpcc.c
--- a/sys/dev/ic/clmpcc.c       Sat Jul 29 04:19:43 2000 +0000
+++ b/sys/dev/ic/clmpcc.c       Sat Jul 29 17:23:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clmpcc.c,v 1.10.4.1 2000/07/22 15:28:19 scw Exp $ */
+/*     $NetBSD: clmpcc.c,v 1.10.4.2 2000/07/29 17:23:16 scw Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -1226,16 +1226,16 @@
                }
 
                clmpcc_wrreg(sc, CLMPCC_REG_REOIR, 0);
+#ifndef __GENERIC_SOFT_INTERRUPTS
                if ( sc->sc_soft_running == 0 ) {
                        sc->sc_soft_running = 1;
-#ifndef __GENERIC_SOFT_INTERRUPTS
                        (sc->sc_softhook)(sc);
                }
-       } else
-               clmpcc_wrreg(sc, CLMPCC_REG_REOIR, CLMPCC_REOIR_NO_TRANS);
 #else
                softintr_schedule(sc->sc_softintr_cookie);
 #endif
+       } else
+               clmpcc_wrreg(sc, CLMPCC_REG_REOIR, CLMPCC_REOIR_NO_TRANS);
 
 #ifdef DDB
        /*



Home | Main Index | Thread Index | Old Index