Merge "input: ft5x06_ts: fix the Focaltech CTP current leakage issue" (c57332e4) · Commits · e / devices / android_kernel_sony_msm8994

drivers/input/touchscreen/ft5x06_ts.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -593,11 +593,6 @@ static int ft5x06_ts_suspend(struct device *dev)
		dev_info(dev, "Already in suspend state\n");
		return 0;
		}
		if (data->ts_pinctrl) {
		err = ft5x06_ts_pinctrl_select(data, false);
		if (err < 0)
		dev_err(dev, "Cannot get idle pinctrl state\n");
		}

		disable_irq(data->client->irq);

		@@ -666,11 +661,6 @@ static int ft5x06_ts_resume(struct device *dev)
		return err;
		}
		}
		if (data->ts_pinctrl) {
		err = ft5x06_ts_pinctrl_select(data, true);
		if (err < 0)
		dev_err(dev, "Cannot get default pinctrl state\n");
		}

		if (gpio_is_valid(data->pdata->reset_gpio)) {
		gpio_set_value_cansleep(data->pdata->reset_gpio, 0);