Input: edt-ft5x06 - do not call desc_to_gpio for invalid gpios
authorFranklin S Cooper Jr <fcooper@ti.com>
Tue, 6 Oct 2015 22:24:34 +0000 (15:24 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 6 Oct 2015 23:38:40 +0000 (16:38 -0700)
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>
drivers/input/touchscreen/edt-ft5x06.c

index 7239c314c9e9bf398620ee98a11461b9050987ea..a8640c7b67130d6ce4db700caec4653b170acec0 100644 (file)
@@ -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;