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 revert a stray splx(s) that somehow got...



details:   https://anonhg.NetBSD.org/src/rev/813ad82cf691
branches:  jmcneill-usbmp
changeset: 771828:813ad82cf691
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Mar 03 02:28:52 2012 +0000

description:
revert a stray splx(s) that somehow got back in here..

diffstat:

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

diffs (35 lines):

diff -r f2171940d79f -r 813ad82cf691 sys/dev/usb/ehci.c
--- a/sys/dev/usb/ehci.c        Sun Feb 26 08:02:36 2012 +0000
+++ b/sys/dev/usb/ehci.c        Sat Mar 03 02:28:52 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ehci.c,v 1.181.6.14 2012/02/26 05:05:44 mrg Exp $ */
+/*     $NetBSD: ehci.c,v 1.181.6.15 2012/03/03 02:28:52 mrg Exp $ */
 
 /*
  * Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.181.6.14 2012/02/26 05:05:44 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.181.6.15 2012/03/03 02:28:52 mrg Exp $");
 
 #include "ohci.h"
 #include "uhci.h"
@@ -2879,7 +2879,7 @@
 {
        struct ehci_soft_itd *itd, *freeitd;
        usbd_status err;
-       int i, s, offs, frindex, previndex;
+       int i, offs, frindex, previndex;
        usb_dma_t dma;
 
        KASSERT(mutex_owned(&sc->sc_lock));
@@ -2933,7 +2933,6 @@
        itd->u.frame_list.prev = NULL;
        itd->xfer_next = NULL;
        itd->slot = 0;
-       splx(s);
 
        return itd;
 }



Home | Main Index | Thread Index | Old Index