From owner-svn-src-stable-10@FreeBSD.ORG  Wed Feb 19 08:05:43 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 65BDE7B5;
 Wed, 19 Feb 2014 08:05:43 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5189C1744;
 Wed, 19 Feb 2014 08:05:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1J85hPi012507;
 Wed, 19 Feb 2014 08:05:43 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1J85haY012506;
 Wed, 19 Feb 2014 08:05:43 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201402190805.s1J85haY012506@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 19 Feb 2014 08:05:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r262213 - in stable: 10/sys/dev/usb/controller
 9/sys/dev/usb/controller
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Feb 2014 08:05:43 -0000

Author: dim
Date: Wed Feb 19 08:05:42 2014
New Revision: 262213
URL: http://svnweb.freebsd.org/changeset/base/262213

Log:
  MFC r261977:
  
  In sys/dev/usb/controller/musb_otg.c, fix a warning about musbotg_odevd
  being unused, by adding it to the part that handles getting descriptors.
  
  Reviewed by:	hselasky

Modified:
  stable/10/sys/dev/usb/controller/musb_otg.c
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/9/sys/dev/usb/controller/musb_otg.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/10/sys/dev/usb/controller/musb_otg.c
==============================================================================
--- stable/10/sys/dev/usb/controller/musb_otg.c	Wed Feb 19 07:59:50 2014	(r262212)
+++ stable/10/sys/dev/usb/controller/musb_otg.c	Wed Feb 19 08:05:42 2014	(r262213)
@@ -3776,6 +3776,13 @@ tr_handle_get_descriptor:
 		len = sizeof(musbotg_devd);
 		ptr = (const void *)&musbotg_devd;
 		goto tr_valid;
+	case UDESC_DEVICE_QUALIFIER:
+		if (value & 0xff) {
+			goto tr_stalled;
+		}
+		len = sizeof(musbotg_odevd);
+		ptr = (const void *)&musbotg_odevd;
+		goto tr_valid;
 	case UDESC_CONFIG:
 		if (value & 0xff) {
 			goto tr_stalled;