Source-Changes-HG archive

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

[src/jmcneill-usbmp]: src/sys/dev/usb don't forget to drop the lock in ohci_i...



details:   https://anonhg.NetBSD.org/src/rev/ebc84d7bd231
branches:  jmcneill-usbmp
changeset: 771779:ebc84d7bd231
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Dec 06 05:05:30 2011 +0000

description:
don't forget to drop the lock in ohci_intr if we got there when
polling.  also don't try to drop a lock we don't have in ohci_open.

XXX: these might apply to ehci as well, i found them when porting
XXX: to uhci.

diffstat:

 sys/dev/usb/ohci.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 9c684784953d -r ebc84d7bd231 sys/dev/usb/ohci.c
--- a/sys/dev/usb/ohci.c        Tue Dec 06 02:10:01 2011 +0000
+++ b/sys/dev/usb/ohci.c        Tue Dec 06 05:05:30 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ohci.c,v 1.218.6.3 2011/12/06 02:10:01 mrg Exp $       */
+/*     $NetBSD: ohci.c,v 1.218.6.4 2011/12/06 05:05:30 mrg Exp $       */
 /*     $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $       */
 
 /*
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.218.6.3 2011/12/06 02:10:01 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.218.6.4 2011/12/06 05:05:30 mrg Exp $");
 
 #include "opt_usb.h"
 
@@ -1147,7 +1147,7 @@
                OWRITE4(sc, OHCI_INTERRUPT_STATUS,
                        OREAD4(sc, OHCI_INTERRUPT_STATUS));
 
-               return (0);
+               goto done;
        }
 
        ret = ohci_intr1(sc);
@@ -2225,7 +2225,6 @@
        if (sed != NULL)
                ohci_free_sed(sc, sed);
  bad0:
-       mutex_exit(&sc->sc_lock);
        return err;
 
 }



Home | Main Index | Thread Index | Old Index