From owner-svn-src-stable-9@FreeBSD.ORG  Thu May 24 01:23:30 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B121D1065672;
	Thu, 24 May 2012 01:23:30 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9C1CF8FC0A;
	Thu, 24 May 2012 01:23:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4O1NU88006420;
	Thu, 24 May 2012 01:23:30 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4O1NUsG006417;
	Thu, 24 May 2012 01:23:30 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201205240123.q4O1NUsG006417@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 24 May 2012 01:23:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235866 - in stable/9: lib/libusbhid sys/dev/usb
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 May 2012 01:23:30 -0000

Author: mav
Date: Thu May 24 01:23:30 2012
New Revision: 235866
URL: http://svn.freebsd.org/changeset/base/235866

Log:
  MFC r235510:
  HID Report ID is unsigned value, so clear the rest of bits from possible
  sign expansion.

Modified:
  stable/9/lib/libusbhid/parse.c
  stable/9/sys/dev/usb/usb_hid.c
Directory Properties:
  stable/9/lib/libusbhid/   (props changed)
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/lib/libusbhid/parse.c
==============================================================================
--- stable/9/lib/libusbhid/parse.c	Wed May 23 23:43:55 2012	(r235865)
+++ stable/9/lib/libusbhid/parse.c	Thu May 24 01:23:30 2012	(r235866)
@@ -392,7 +392,7 @@ hid_get_item(hid_data_t s, hid_item_t *h
 				s->loc_size = dval & mask;
 				break;
 			case 8:
-				hid_switch_rid(s, c, dval);
+				hid_switch_rid(s, c, dval & mask);
 				break;
 			case 9:
 				/* mask because value is unsigned */

Modified: stable/9/sys/dev/usb/usb_hid.c
==============================================================================
--- stable/9/sys/dev/usb/usb_hid.c	Wed May 23 23:43:55 2012	(r235865)
+++ stable/9/sys/dev/usb/usb_hid.c	Thu May 24 01:23:30 2012	(r235866)
@@ -425,7 +425,7 @@ hid_get_item(struct hid_data *s, struct 
 				s->loc_size = dval & mask;
 				break;
 			case 8:
-				hid_switch_rid(s, c, dval);
+				hid_switch_rid(s, c, dval & mask);
 				break;
 			case 9:
 				/* mask because value is unsigned */