From owner-svn-src-head@freebsd.org  Thu Oct 19 20:42:47 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D32F9E47214;
 Thu, 19 Oct 2017 20:42:47 +0000 (UTC)
 (envelope-from wulf@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A0DEF800D4;
 Thu, 19 Oct 2017 20:42:47 +0000 (UTC)
 (envelope-from wulf@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9JKgkPS046430;
 Thu, 19 Oct 2017 20:42:46 GMT (envelope-from wulf@FreeBSD.org)
Received: (from wulf@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9JKgkej046429;
 Thu, 19 Oct 2017 20:42:46 GMT (envelope-from wulf@FreeBSD.org)
Message-Id: <201710192042.v9JKgkej046429@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wulf set sender to
 wulf@FreeBSD.org using -f
From: Vladimir Kondratyev <wulf@FreeBSD.org>
Date: Thu, 19 Oct 2017 20:42:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324770 - head/usr.sbin/bluetooth/bthidd
X-SVN-Group: head
X-SVN-Commit-Author: wulf
X-SVN-Commit-Paths: head/usr.sbin/bluetooth/bthidd
X-SVN-Commit-Revision: 324770
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Oct 2017 20:42:47 -0000

Author: wulf
Date: Thu Oct 19 20:42:46 2017
New Revision: 324770
URL: https://svnweb.freebsd.org/changeset/base/324770

Log:
  bthidd: Fix leds on multireport keyboards broken after r297217
  
  Reviewed by:		emax, gonzo
  Approved by:		gonzo (mentor)
  MFC after:		2 weeks
  Differential Revision:	https://reviews.freebsd.org/D12214

Modified:
  head/usr.sbin/bluetooth/bthidd/kbd.c

Modified: head/usr.sbin/bluetooth/bthidd/kbd.c
==============================================================================
--- head/usr.sbin/bluetooth/bthidd/kbd.c	Thu Oct 19 20:28:04 2017	(r324769)
+++ head/usr.sbin/bluetooth/bthidd/kbd.c	Thu Oct 19 20:42:46 2017	(r324770)
@@ -569,6 +569,11 @@ kbd_status_changed(bthid_session_p s, uint8_t *data, i
 	}
 	hid_end_parse(d);
 
+	if (report_id != NO_REPORT_ID) {
+		data[2] = data[1];
+		data[1] = report_id;
+	}
+
 	if (found)
 		write(s->intr, data, (report_id != NO_REPORT_ID) ? 3 : 2);