Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/usb default pipe is mpsafe, deal with it



details:   https://anonhg.NetBSD.org/src/rev/a7078f62b488
branches:  trunk
changeset: 784222:a7078f62b488
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue Jan 22 14:01:19 2013 +0000

description:
default pipe is mpsafe, deal with it

diffstat:

 sys/dev/usb/usb_subr.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r ece7e1022e88 -r a7078f62b488 sys/dev/usb/usb_subr.c
--- a/sys/dev/usb/usb_subr.c    Tue Jan 22 13:51:45 2013 +0000
+++ b/sys/dev/usb/usb_subr.c    Tue Jan 22 14:01:19 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usb_subr.c,v 1.188 2013/01/22 12:40:43 jmcneill Exp $  */
+/*     $NetBSD: usb_subr.c,v 1.189 2013/01/22 14:01:19 jmcneill Exp $  */
 /*     $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $   */
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.188 2013/01/22 12:40:43 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.189 2013/01/22 14:01:19 jmcneill Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -1171,8 +1171,8 @@
        dev->cookie.cookie = ++usb_cookie_no;
 
        /* Establish the default pipe. */
-       err = usbd_setup_pipe(dev, 0, &dev->def_ep, USBD_DEFAULT_INTERVAL,
-                             &dev->default_pipe);
+       err = usbd_setup_pipe_flags(dev, 0, &dev->def_ep, USBD_DEFAULT_INTERVAL,
+                             &dev->default_pipe, USBD_MPSAFE);
        if (err) {
                usbd_remove_device(dev, up);
                return (err);
@@ -1259,8 +1259,8 @@
 
        /* Re-establish the default pipe with the new address. */
        usbd_kill_pipe(dev->default_pipe);
-       err = usbd_setup_pipe(dev, 0, &dev->def_ep, USBD_DEFAULT_INTERVAL,
-           &dev->default_pipe);
+       err = usbd_setup_pipe_flags(dev, 0, &dev->def_ep, USBD_DEFAULT_INTERVAL,
+           &dev->default_pipe, USBD_MPSAFE);
        if (err) {
                DPRINTFN(-1, ("usbd_new_device: setup default pipe failed\n"));
                usbd_remove_device(dev, up);



Home | Main Index | Thread Index | Old Index