Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/usb Opening umidi read-only failed to increment ep->...



details:   https://anonhg.NetBSD.org/src/rev/ab889e4e078e
branches:  trunk
changeset: 555971:ab889e4e078e
user:      gson <gson%NetBSD.org@localhost>
date:      Fri Dec 05 06:01:59 2003 +0000

description:
Opening umidi read-only failed to increment ep->num_open because
open_in_jack() treated USBD_IN_PROGRESS as a failure return.

diffstat:

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

diffs (28 lines):

diff -r df78b3db1979 -r ab889e4e078e sys/dev/usb/umidi.c
--- a/sys/dev/usb/umidi.c       Fri Dec 05 04:55:42 2003 +0000
+++ b/sys/dev/usb/umidi.c       Fri Dec 05 06:01:59 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: umidi.c,v 1.17 2003/12/04 13:57:31 keihan Exp $        */
+/*     $NetBSD: umidi.c,v 1.18 2003/12/05 06:01:59 gson Exp $  */
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.17 2003/12/04 13:57:31 keihan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.18 2003/12/05 06:01:59 gson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -890,7 +890,8 @@
        jack->opened = 1;
        if (ep->num_open++==0 && UE_GET_DIR(ep->addr)==UE_DIR_IN) {
                err = start_input_transfer(ep);
-               if (err!=USBD_NORMAL_COMPLETION) {
+               if (err != USBD_NORMAL_COMPLETION &&
+                   err != USBD_IN_PROGRESS) {
                        ep->num_open--;
                }
        }



Home | Main Index | Thread Index | Old Index