Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd467299 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: raydium_i2c_ts - do not ignore EPROBE_DEFER from gpiod_get_optional 



We should not be ignoring -EPROBE_DEFER reported by
devm_gpiod_get_optional(), but report it as any other error to the upper
layers. While we are at it simplify check for the presence of reset GPIO
and instead of using IS_ERR_OR_NULL just use boolean.

Also do not return -ENOMEM from suspend handler when the device in
bootloader mode as that does not make sense and switch to -EBUSY instead.

Reported-by: default avatarGuenter Roeck <groeck@chromium.org>
Reviewed-by: default avatarGuenter Roeck <groeck@chromium.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 48a2b783

drivers/input/touchscreen/raydium_i2c_ts.c

+5 −6
Original line number Diff line number Diff line
@@ -930,7 +930,7 @@ static int raydium_i2c_power_on(struct raydium_data *ts) 
{

	int error;



	if (IS_ERR_OR_NULL(ts->reset_gpio))

	if (!ts->reset_gpio)

		return 0;



	gpiod_set_value_cansleep(ts->reset_gpio, 1);
@@ -967,7 +967,7 @@ static void raydium_i2c_power_off(void *_data) 
{

	struct raydium_data *ts = _data;



	if (!IS_ERR_OR_NULL(ts->reset_gpio)) {

	if (ts->reset_gpio) {

		gpiod_set_value_cansleep(ts->reset_gpio, 1);

		regulator_disable(ts->vccio);

		regulator_disable(ts->avdd);
@@ -1018,12 +1018,11 @@ static int raydium_i2c_probe(struct i2c_client *client, 
						 GPIOD_OUT_LOW);

	if (IS_ERR(ts->reset_gpio)) {

		error = PTR_ERR(ts->reset_gpio);

		if (error != -EPROBE_DEFER) {

		if (error != -EPROBE_DEFER)

			dev_err(&client->dev,

				"failed to get reset gpio: %d\n", error);

		return error;

	}

	}



	error = raydium_i2c_power_on(ts);

	if (error)
@@ -1138,7 +1137,7 @@ static int __maybe_unused raydium_i2c_suspend(struct device *dev) 


	/* Sleep is not available in BLDR recovery mode */

	if (ts->boot_mode != RAYDIUM_TS_MAIN)

		return -ENOMEM;

		return -EBUSY;



	disable_irq(client->irq);