From owner-svn-src-head@FreeBSD.ORG  Wed May 13 18:05:41 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0168A1065687;
	Wed, 13 May 2009 18:05:41 +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 E46628FC22;
	Wed, 13 May 2009 18:05:40 +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 n4DI5eLL063515;
	Wed, 13 May 2009 18:05:40 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4DI5e3B063514;
	Wed, 13 May 2009 18:05:40 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <200905131805.n4DI5e3B063514@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Wed, 13 May 2009 18:05:40 +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: r192054 - head/sys/dev/usb
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 May 2009 18:05:41 -0000

Author: thompsa
Date: Wed May 13 18:05:40 2009
New Revision: 192054
URL: http://svn.freebsd.org/changeset/base/192054

Log:
  Check the correct variable for IO_NDELAY.
  
  Submitted by:	Hans Petter Selasky

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

Modified: head/sys/dev/usb/usb_dev.c
==============================================================================
--- head/sys/dev/usb/usb_dev.c	Wed May 13 18:04:51 2009	(r192053)
+++ head/sys/dev/usb/usb_dev.c	Wed May 13 18:05:40 2009	(r192054)
@@ -1203,7 +1203,7 @@ usb2_read(struct cdev *dev, struct uio *
 
 			(f->methods->f_start_read) (f);
 
-			if (fflags & IO_NDELAY) {
+			if (ioflag & IO_NDELAY) {
 				if (tr_data) {
 					/* return length before error */
 					break;
@@ -1326,7 +1326,7 @@ usb2_write(struct cdev *dev, struct uio 
 
 		if (m == NULL) {
 
-			if (fflags & IO_NDELAY) {
+			if (ioflag & IO_NDELAY) {
 				if (tr_data) {
 					/* return length before error */
 					break;