]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
Input: drv260x - fix initializing overdrive voltage
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 11 Dec 2016 06:56:21 +0000 (22:56 -0800)
committerSasha Levin <alexander.levin@microsoft.com>
Wed, 23 May 2018 01:36:36 +0000 (21:36 -0400)
[ Upstream commit 74c82dae6c474933f2be401976e1530b5f623221 ]

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>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
drivers/input/misc/drv260x.c

index 009f75d25268fd167a9f506c7b6804b4cd55b9d5..4e5ad9e120d642c6715a55a3829b7b0d93efb6a2 100644 (file)
@@ -521,7 +521,7 @@ static int drv260x_probe(struct i2c_client *client,
        if (!haptics)
                return -ENOMEM;
 
-       haptics->rated_voltage = DRV260X_DEF_OD_CLAMP_VOLT;
+       haptics->overdrive_voltage = DRV260X_DEF_OD_CLAMP_VOLT;
        haptics->rated_voltage = DRV260X_DEF_RATED_VOLT;
 
        if (pdata) {