tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

* 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: wiimote: fix invalid power_supply_powers call
HID: wacom: Fix invalid power_supply_powers calls
HID: hyperv: Properly disconnect the input device
HID: usbhid: fix dead lock between open and disconect

Linus Torvalds e25c1733 abaaf3e1

+9 -7
+1
drivers/hid/hid-hyperv.c
··· 548 548 struct mousevsc_dev *input_dev = hv_get_drvdata(dev); 549 549 550 550 vmbus_close(dev->channel); 551 + hid_hw_stop(input_dev->hid_device); 551 552 hid_destroy_device(input_dev->hid_device); 552 553 mousevsc_free_device(input_dev); 553 554
+4 -3
drivers/hid/hid-wacom.c
··· 531 531 wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY; 532 532 wdata->battery.use_for_apm = 0; 533 533 534 - power_supply_powers(&wdata->battery, &hdev->dev); 535 534 536 535 ret = power_supply_register(&hdev->dev, &wdata->battery); 537 536 if (ret) { ··· 539 540 goto err_battery; 540 541 } 541 542 543 + power_supply_powers(&wdata->battery, &hdev->dev); 544 + 542 545 wdata->ac.properties = wacom_ac_props; 543 546 wdata->ac.num_properties = ARRAY_SIZE(wacom_ac_props); 544 547 wdata->ac.get_property = wacom_ac_get_property; ··· 548 547 wdata->ac.type = POWER_SUPPLY_TYPE_MAINS; 549 548 wdata->ac.use_for_apm = 0; 550 549 551 - power_supply_powers(&wdata->battery, &hdev->dev); 552 - 553 550 ret = power_supply_register(&hdev->dev, &wdata->ac); 554 551 if (ret) { 555 552 hid_warn(hdev, 556 553 "can't create ac battery attribute, err: %d\n", ret); 557 554 goto err_ac; 558 555 } 556 + 557 + power_supply_powers(&wdata->ac, &hdev->dev); 559 558 #endif 560 559 return 0; 561 560
+2 -2
drivers/hid/hid-wiimote-core.c
··· 1226 1226 wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY; 1227 1227 wdata->battery.use_for_apm = 0; 1228 1228 1229 - power_supply_powers(&wdata->battery, &hdev->dev); 1230 - 1231 1229 ret = power_supply_register(&wdata->hdev->dev, &wdata->battery); 1232 1230 if (ret) { 1233 1231 hid_err(hdev, "Cannot register battery device\n"); 1234 1232 goto err_battery; 1235 1233 } 1234 + 1235 + power_supply_powers(&wdata->battery, &hdev->dev); 1236 1236 1237 1237 ret = wiimote_leds_create(wdata); 1238 1238 if (ret)
+2 -2
drivers/hid/usbhid/hiddev.c
··· 922 922 struct hiddev *hiddev = hid->hiddev; 923 923 struct usbhid_device *usbhid = hid->driver_data; 924 924 925 + usb_deregister_dev(usbhid->intf, &hiddev_class); 926 + 925 927 mutex_lock(&hiddev->existancelock); 926 928 hiddev->exist = 0; 927 - 928 - usb_deregister_dev(usbhid->intf, &hiddev_class); 929 929 930 930 if (hiddev->open) { 931 931 mutex_unlock(&hiddev->existancelock);