forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c 
 kernel/drivers/input/touchscreen/elants_i2c.c
....@@ -1219,14 +1219,12 @@
12191219 	if (IS_ERR_OR_NULL(ts->reset_gpio))
12201220 		return 0;
12211221 
1222
-	gpiod_set_value_cansleep(ts->reset_gpio, 1);
1223
-
12241222 	error = regulator_enable(ts->vcc33);
12251223 	if (error) {
12261224 		dev_err(&ts->client->dev,
12271225 			"failed to enable vcc33 regulator: %d\n",
12281226 			error);
1229
-		goto release_reset_gpio;
1227
+		return error;
12301228 	}
12311229 
12321230 	error = regulator_enable(ts->vccio);
....@@ -1235,7 +1233,7 @@
12351233 			"failed to enable vccio regulator: %d\n",
12361234 			error);
12371235 		regulator_disable(ts->vcc33);
1238
-		goto release_reset_gpio;
1236
+		return error;
12391237 	}
12401238 
12411239 	/*
....@@ -1244,7 +1242,6 @@
12441242 	 */
12451243 	udelay(ELAN_POWERON_DELAY_USEC);
12461244 
1247
-release_reset_gpio:
12481245 	gpiod_set_value_cansleep(ts->reset_gpio, 0);
12491246 	if (error)
12501247 		return error;
....@@ -1352,7 +1349,7 @@
13521349 		return error;
13531350 	}
13541351 
1355
-	ts->reset_gpio = devm_gpiod_get(&client->dev, "reset", GPIOD_OUT_LOW);
1352
+	ts->reset_gpio = devm_gpiod_get(&client->dev, "reset", GPIOD_OUT_HIGH);
13561353 	if (IS_ERR(ts->reset_gpio)) {
13571354 		error = PTR_ERR(ts->reset_gpio);
13581355