Commit 8b58cc36 authored Oct 06, 2015 by Franklin S Cooper Jr Committed by Dmitry Torokhov Oct 06, 2015

Input: edt-ft5x06 - do not call desc_to_gpio for invalid gpios



Since reset and wake pin are optional the gpio structure for those
pins may be null. Therefore, they can't be blindly passed to
desc_to_gpio.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

parent 5b21e3c7

drivers/input/touchscreen/edt-ft5x06.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -987,8 +987,9 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client,

		dev_dbg(&client->dev,
		"EDT FT5x06 initialized: IRQ %d, WAKE pin %d, Reset pin %d.\n",
		client->irq, desc_to_gpio(tsdata->wake_gpio),
		desc_to_gpio(tsdata->reset_gpio));
		client->irq,
		tsdata->wake_gpio ? desc_to_gpio(tsdata->wake_gpio) : -1,
		tsdata->reset_gpio ? desc_to_gpio(tsdata->reset_gpio) : -1);

		return 0;