diff options
| author | Kenneth Kwak <kkwak@nvidia.com> | 2014-06-24 21:30:53 -0700 |
|---|---|---|
| committer | Peter Kim <pekim@nvidia.com> | 2014-06-25 19:12:49 -0700 |
| commit | 08398d6482017e234fdad0b0b228a7a603b7d248 (patch) | |
| tree | c27cf1592d9d8672039cbf03ea094d9a77b2598e | |
| parent | 34022539b84a29896bcde69f10d1a4143d2772c8 (diff) | |
Revert "HID: usbhid: add safety check at _report"
DO NOT INTEGRATE
Bug 1466757
This reverts commit fd35fa2f2145ddc0a0cde5bc09c7483841f68613.
Change-Id: I7d83463345f5c24fdafe693b63082418bf19a230
Signed-off-by: Kenneth Kwak <kkwak@nvidia.com>
Reviewed-on: http://git-master/r/428069
Reviewed-by: Peter Kim <pekim@nvidia.com>
Tested-by: Peter Kim <pekim@nvidia.com>
| -rw-r--r-- | drivers/hid/usbhid/hid-core.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index f03401947718..4bbb883a3dd2 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -901,21 +901,12 @@ static int usbhid_get_raw_report(struct hid_device *hid, unsigned char report_type) { struct usbhid_device *usbhid = hid->driver_data; - struct usb_device *dev; - struct usb_interface *intf; - struct usb_host_interface *interface; + struct usb_device *dev = hid_to_usb_dev(hid); + struct usb_interface *intf = usbhid->intf; + struct usb_host_interface *interface = intf->cur_altsetting; int skipped_report_id = 0; int ret; - if (test_bit(HID_DISCONNECTED, &usbhid->iofl)) { - pr_err("hid device disconnected\n"); - return -ESHUTDOWN; - } - - dev = hid_to_usb_dev(hid); - intf = usbhid->intf; - interface = intf->cur_altsetting; - /* Byte 0 is the report number. Report data starts at byte 1.*/ buf[0] = report_number; if (report_number == 0x0) { |