From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Sun, 11 Dec 2016 06:56:21 +0000 (-0800)
Subject: Input: drv260x - fix initializing overdrive voltage
X-Git-Tag: v4.1.52~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4bb62a4614b3eb33a4a54021503a4a5832ee909;p=thirdparty%2Fkernel%2Fstable.git

Input: drv260x - fix initializing overdrive voltage

[ 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>
---

diff --git a/drivers/input/misc/drv260x.c b/drivers/input/misc/drv260x.c
index 009f75d25268f..4e5ad9e120d64 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,
 	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) {