xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linus

Browse Source 
Conflicts:
	drivers/hid/wacom_wac.c
This commit is contained in:
Jiri Kosina
2015-06-22 16:23:43 +02:00
parent 817a312581 3e48138c2c 181a8b911d 81bb773fae 10e87dc42a 30ee72f0d2 6e5e9a06a2 b2723eb73c 2a6cdbdd4c
commit ec3b34e197
8015 changed files with 333542 additions and 173658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/hid/i2c-hid/i2c-hid.c
View File

@@ -1019,7 +1019,6 @@ static int i2c_hid_probe(struct i2c_client *client,
hid->driver_data = client;
hid->ll_driver = &i2c_hid_ll_driver;
hid->dev.parent = &client->dev;
ACPI_COMPANION_SET(&hid->dev, ACPI_COMPANION(&client->dev));
hid->bus = BUS_I2C;
hid->version = le16_to_cpu(ihid->hdesc.bcdVersion);
hid->vendor = le16_to_cpu(ihid->hdesc.wVendorID);