From owner-svn-src-head@FreeBSD.ORG  Tue Aug  5 09:59:16 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C0BFD7AD
 for <svn-src-head@freebsd.org>; Tue,  5 Aug 2014 09:59:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 96F412F44
 for <svn-src-head@freebsd.org>; Tue,  5 Aug 2014 09:59:16 +0000 (UTC)
Received: from n_hibma (uid 745) (envelope-from n_hibma@FreeBSD.org) id 5cd0
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Tue, 05 Aug 2014 09:59:16 +0000
From: Nick Hibma <n_hibma@FreeBSD.org>
Date: Tue, 5 Aug 2014 09:59:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269578 - head/sys/dev/usb
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e0aaf4.5cd0.77eae445@svn.freebsd.org>
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
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/options/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: Tue, 05 Aug 2014 09:59:16 -0000

Author: n_hibma
Date: Tue Aug  5 09:59:16 2014
New Revision: 269578
URL: http://svnweb.freebsd.org/changeset/base/269578

Log:
  Return USB_ERR_INVAL if the eject method is not known.
  
  PR:		145319
  Submitted by:	rozhuk.im gmail.com

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

Modified: head/sys/dev/usb/usb_msctest.c
==============================================================================
--- head/sys/dev/usb/usb_msctest.c	Tue Aug  5 09:44:10 2014	(r269577)
+++ head/sys/dev/usb/usb_msctest.c	Tue Aug  5 09:59:16 2014	(r269578)
@@ -859,9 +859,10 @@ usb_msc_eject(struct usb_device *udev, u
 		break;
 	default:
 		DPRINTF("Unknown eject method (%d)\n", method);
-		err = 0;
-		break;
+		bbb_detach(sc);
+		return (USB_ERR_INVAL);
 	}
+
 	DPRINTF("Eject CD command status: %s\n", usbd_errstr(err));
 
 	bbb_detach(sc);