aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2016-12-11 01:56:21 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-12-12 14:26:23 -0500
commit74c82dae6c474933f2be401976e1530b5f623221 (patch)
tree766452e7d86072f529a9b0442c2f933c78f1f777
parent7343d11906788214220b124c379f5b0e1cec834f (diff)
Input: drv260x - fix initializing overdrive voltage
We were accidentally initializing haptics->rated_voltage twice, and did not initialize overdrive voltage. Acked-by: Dan Murphy <dmurphy@ti.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/misc/drv260x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/drv260x.c b/drivers/input/misc/drv260x.c
index 2adfd86c869a..9789d4fb6e51 100644
--- a/drivers/input/misc/drv260x.c
+++ b/drivers/input/misc/drv260x.c
@@ -521,7 +521,7 @@ static int drv260x_probe(struct i2c_client *client,
521 if (!haptics) 521 if (!haptics)
522 return -ENOMEM; 522 return -ENOMEM;
523 523
524 haptics->rated_voltage = DRV260X_DEF_OD_CLAMP_VOLT; 524 haptics->overdrive_voltage = DRV260X_DEF_OD_CLAMP_VOLT;
525 haptics->rated_voltage = DRV260X_DEF_RATED_VOLT; 525 haptics->rated_voltage = DRV260X_DEF_RATED_VOLT;
526 526
527 if (pdata) { 527 if (pdata) {