Module Name: src
Committed By: skrll
Date: Sat Jan 19 15:10:05 UTC 2013
Modified Files:
src/sys/dev/usb: usbdi.c
Log Message:
Pay attention to the return value from cv_wait_sig as well in
usbd_transfer. hi christos.
To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 src/sys/dev/usb/usbdi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.145 src/sys/dev/usb/usbdi.c:1.146
--- src/sys/dev/usb/usbdi.c:1.145 Sat Jan 19 14:36:41 2013
+++ src/sys/dev/usb/usbdi.c Sat Jan 19 15:10:05 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.145 2013/01/19 14:36:41 skrll Exp $ */
+/* $NetBSD: usbdi.c,v 1.146 2013/01/19 15:10:05 skrll Exp $ */
/*
* Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.145 2013/01/19 14:36:41 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.146 2013/01/19 15:10:05 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -326,7 +326,7 @@ usbd_transfer(usbd_xfer_handle xfer)
err = 0;
if ((flags & USBD_SYNCHRONOUS_SIG) != 0) {
if (pipe->device->bus->lock)
- cv_wait_sig(&xfer->cv, pipe->device->bus->lock);
+ err = cv_wait_sig(&xfer->cv, pipe->device->bus->lock);
else
err = tsleep(xfer, PZERO|PCATCH, "usbsyn", 0);
} else {
