From owner-svn-src-all@FreeBSD.ORG  Mon Jan 19 21:22:10 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AC4E91065674;
	Mon, 19 Jan 2009 21:22:10 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 998E68FC14;
	Mon, 19 Jan 2009 21:22:10 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0JLMAbj021611;
	Mon, 19 Jan 2009 21:22:10 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0JLMA57021610;
	Mon, 19 Jan 2009 21:22:10 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <200901192122.n0JLMA57021610@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Mon, 19 Jan 2009 21:22:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187447 - head/sys/dev/usb
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jan 2009 21:22:11 -0000

Author: thompsa
Date: Mon Jan 19 21:22:10 2009
New Revision: 187447
URL: http://svn.freebsd.org/changeset/base/187447

Log:
  Set the pipe pointer before calling usbd_transfer() as its possible for the
  xfer callback to be invoked on error.
  
  MFC after:	2 weeks

Modified:
  head/sys/dev/usb/usbdi.c

Modified: head/sys/dev/usb/usbdi.c
==============================================================================
--- head/sys/dev/usb/usbdi.c	Mon Jan 19 21:10:04 2009	(r187446)
+++ head/sys/dev/usb/usbdi.c	Mon Jan 19 21:22:10 2009	(r187447)
@@ -237,8 +237,8 @@ usbd_open_pipe_intr(usbd_interface_handl
 	    USBD_NO_TIMEOUT, cb);
 	ipipe->intrxfer = xfer;
 	ipipe->repeat = 1;
-	err = usbd_transfer(xfer);
 	*pipe = ipipe;
+	err = usbd_transfer(xfer);
 	if (err != USBD_IN_PROGRESS && err)
 		goto bad2;
 	return (USBD_NORMAL_COMPLETION);