diff options
Diffstat (limited to 'drivers/hid/hid-lenovo-tpkbd.c')
-rw-r--r-- | drivers/hid/hid-lenovo-tpkbd.c | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/drivers/hid/hid-lenovo-tpkbd.c b/drivers/hid/hid-lenovo-tpkbd.c index 07837f5a4eb8..31cf29a6ba17 100644 --- a/drivers/hid/hid-lenovo-tpkbd.c +++ b/drivers/hid/hid-lenovo-tpkbd.c | |||
@@ -339,7 +339,15 @@ static int tpkbd_probe_tp(struct hid_device *hdev) | |||
339 | struct tpkbd_data_pointer *data_pointer; | 339 | struct tpkbd_data_pointer *data_pointer; |
340 | size_t name_sz = strlen(dev_name(dev)) + 16; | 340 | size_t name_sz = strlen(dev_name(dev)) + 16; |
341 | char *name_mute, *name_micmute; | 341 | char *name_mute, *name_micmute; |
342 | int ret; | 342 | int i, ret; |
343 | |||
344 | /* Validate required reports. */ | ||
345 | for (i = 0; i < 4; i++) { | ||
346 | if (!hid_validate_values(hdev, HID_FEATURE_REPORT, 4, i, 1)) | ||
347 | return -ENODEV; | ||
348 | } | ||
349 | if (!hid_validate_values(hdev, HID_OUTPUT_REPORT, 3, 0, 2)) | ||
350 | return -ENODEV; | ||
343 | 351 | ||
344 | if (sysfs_create_group(&hdev->dev.kobj, | 352 | if (sysfs_create_group(&hdev->dev.kobj, |
345 | &tpkbd_attr_group_pointer)) { | 353 | &tpkbd_attr_group_pointer)) { |
@@ -406,22 +414,27 @@ static int tpkbd_probe(struct hid_device *hdev, | |||
406 | ret = hid_parse(hdev); | 414 | ret = hid_parse(hdev); |
407 | if (ret) { | 415 | if (ret) { |
408 | hid_err(hdev, "hid_parse failed\n"); | 416 | hid_err(hdev, "hid_parse failed\n"); |
409 | goto err_free; | 417 | goto err; |
410 | } | 418 | } |
411 | 419 | ||
412 | ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT); | 420 | ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT); |
413 | if (ret) { | 421 | if (ret) { |
414 | hid_err(hdev, "hid_hw_start failed\n"); | 422 | hid_err(hdev, "hid_hw_start failed\n"); |
415 | goto err_free; | 423 | goto err; |
416 | } | 424 | } |
417 | 425 | ||
418 | uhdev = (struct usbhid_device *) hdev->driver_data; | 426 | uhdev = (struct usbhid_device *) hdev->driver_data; |
419 | 427 | ||
420 | if (uhdev->ifnum == 1) | 428 | if (uhdev->ifnum == 1) { |
421 | return tpkbd_probe_tp(hdev); | 429 | ret = tpkbd_probe_tp(hdev); |
430 | if (ret) | ||
431 | goto err_hid; | ||
432 | } | ||
422 | 433 | ||
423 | return 0; | 434 | return 0; |
424 | err_free: | 435 | err_hid: |
436 | hid_hw_stop(hdev); | ||
437 | err: | ||
425 | return ret; | 438 | return ret; |
426 | } | 439 | } |
427 | 440 | ||