aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/hid/hid-alps.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/hid/hid-alps.c b/drivers/hid/hid-alps.c
index fe8a0624d5e4..b7091507c33f 100644
--- a/drivers/hid/hid-alps.c
+++ b/drivers/hid/hid-alps.c
@@ -460,17 +460,35 @@ static int __maybe_unused alps_post_reset(struct hid_device *hdev)
460 case T4: 460 case T4:
461 ret = t4_read_write_register(hdev, T4_PRM_FEED_CONFIG_1, 461 ret = t4_read_write_register(hdev, T4_PRM_FEED_CONFIG_1,
462 NULL, T4_I2C_ABS, false); 462 NULL, T4_I2C_ABS, false);
463 if (ret < 0) {
464 dev_err(&hdev->dev, "failed T4_PRM_FEED_CONFIG_1 (%d)\n",
465 ret);
466 goto exit;
467 }
468
463 ret = t4_read_write_register(hdev, T4_PRM_FEED_CONFIG_4, 469 ret = t4_read_write_register(hdev, T4_PRM_FEED_CONFIG_4,
464 NULL, T4_FEEDCFG4_ADVANCED_ABS_ENABLE, false); 470 NULL, T4_FEEDCFG4_ADVANCED_ABS_ENABLE, false);
471 if (ret < 0) {
472 dev_err(&hdev->dev, "failed T4_PRM_FEED_CONFIG_4 (%d)\n",
473 ret);
474 goto exit;
475 }
465 break; 476 break;
466 case U1: 477 case U1:
467 ret = u1_read_write_register(hdev, 478 ret = u1_read_write_register(hdev,
468 ADDRESS_U1_DEV_CTRL_1, NULL, 479 ADDRESS_U1_DEV_CTRL_1, NULL,
469 U1_TP_ABS_MODE | U1_SP_ABS_MODE, false); 480 U1_TP_ABS_MODE | U1_SP_ABS_MODE, false);
481 if (ret < 0) {
482 dev_err(&hdev->dev, "failed to change TP mode (%d)\n",
483 ret);
484 goto exit;
485 }
470 break; 486 break;
471 default: 487 default:
472 break; 488 break;
473 } 489 }
490
491exit:
474 return ret; 492 return ret;
475} 493}
476 494