From owner-p4-projects@FreeBSD.ORG  Tue Dec 25 20:29:12 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7911F16A46E; Tue, 25 Dec 2007 20:29:12 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B80B216A468
	for <perforce@FreeBSD.org>; Tue, 25 Dec 2007 20:29:11 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8486213C458
	for <perforce@FreeBSD.org>; Tue, 25 Dec 2007 20:29:11 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBPKTBKY038846
	for <perforce@FreeBSD.org>; Tue, 25 Dec 2007 20:29:11 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBPKTACB038843
	for perforce@freebsd.org; Tue, 25 Dec 2007 20:29:10 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 25 Dec 2007 20:29:10 GMT
Message-Id: <200712252029.lBPKTACB038843@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 131613 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Dec 2007 20:29:12 -0000

http://perforce.freebsd.org/chv.cgi?CH=131613

Change 131613 by hselasky@hselasky_laptop001 on 2007/12/25 20:29:08

	
	Make the "usbd_clear_stall_callback()" NULL safe.
	Also add a line that clears the "stall_pipe" flag
	automatically when using the "usbd_clear_stall_callback()".

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#89 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#89 (text+ko) ====

@@ -3698,6 +3698,8 @@
  *  xfer1: Clear Stall Control Transfer
  *  xfer2: Stalled USB Transfer
  *
+ * This function is NULL safe.
+ *
  * Return values:
  *   0: In progress
  *   Else: Finished
@@ -3708,6 +3710,11 @@
 {
 	usb_device_request_t req;
 
+	if (xfer2 == NULL) {
+		/* looks like we are tearing down */
+		PRINTFN(0, ("NULL input parameter\n"));
+		return (0);
+	}
 	mtx_assert(xfer1->priv_mtx, MA_OWNED);
 	mtx_assert(xfer2->priv_mtx, MA_OWNED);
 
@@ -3756,6 +3763,9 @@
 		}
 		break;
 	}
+
+	xfer2->flags.stall_pipe = 0;	/* stop stalling the pipe */
+
 	return (1);			/* Clear Stall Finished */
 }