From a148beb60ebb40e5501080dba51fadace843a9b8 Mon Sep 17 00:00:00 2001 From: Mika Westerberg Date: Tue, 19 Feb 2013 11:22:33 +0200 Subject: [PATCH] --- yaml --- r: 366327 b: refs/heads/master c: 6399f335c2c5fb9c244bbb2b8a437498d260bed7 h: refs/heads/master i: 366325: dfd00fe787cdea80573a08948f58be694488d551 366323: 291205991d8d0b52636068f36ba73b7fdfb51230 366319: 607ac3de79a0bccccc992fbe49e38769fb7452ae v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-core.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6f8aaa8c5fca..07d7d802d5ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 545bef681088cbf49c9c11d63872698b81eac7eb +refs/heads/master: 6399f335c2c5fb9c244bbb2b8a437498d260bed7 diff --git a/trunk/drivers/hid/hid-core.c b/trunk/drivers/hid/hid-core.c index ff75cabf7393..fea20c650f3f 100644 --- a/trunk/drivers/hid/hid-core.c +++ b/trunk/drivers/hid/hid-core.c @@ -728,8 +728,7 @@ static int hid_scan_report(struct hid_device *hid) } else if (page == HID_UP_SENSOR && item.type == HID_ITEM_TYPE_MAIN && item.tag == HID_MAIN_ITEM_TAG_BEGIN_COLLECTION && - (item_udata(&item) & 0xff) == HID_COLLECTION_PHYSICAL && - (hid->bus == BUS_USB || hid->bus == BUS_I2C)) + (item_udata(&item) & 0xff) == HID_COLLECTION_PHYSICAL) hid->group = HID_GROUP_SENSOR_HUB; }