diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-07 14:06:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-07 14:06:11 -0800 |
| commit | e25c173379d1053f0851fa924cd608fc0b16252f (patch) | |
| tree | 5819d87168530aacef34d3d2fadc45069de901fa /drivers/hid/hid-hyperv.c | |
| parent | abaaf3e12c74ef39c8ba185c485f63274264cb0f (diff) | |
| parent | 217c8b2b1978aa4a02ce040a99c59ed3b6418fe5 (diff) | |
| download | linux-e25c173379d1053f0851fa924cd608fc0b16252f.tar.bz2 | |
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
Diffstat (limited to 'drivers/hid/hid-hyperv.c')
| -rw-r--r-- | drivers/hid/hid-hyperv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-hyperv.c b/drivers/hid/hid-hyperv.c index 0c33ae9cf0f0..406632472c1b 100644 --- a/drivers/hid/hid-hyperv.c +++ b/drivers/hid/hid-hyperv.c @@ -548,6 +548,7 @@ static int mousevsc_remove(struct hv_device *dev) struct mousevsc_dev *input_dev = hv_get_drvdata(dev); vmbus_close(dev->channel); + hid_hw_stop(input_dev->hid_device); hid_destroy_device(input_dev->hid_device); mousevsc_free_device(input_dev); |