Re: Fwd: [RFC] [PATCH] Input: ADP5588 - Support gpio function on unused pin
From: Hennerich, Michael <hidden>
Date: 2010-07-30 08:29:36
Subsystem:
adp5588 qwerty keypad and io expander driver (adp5588/adp5587), input (keyboard, mouse, joystick, touchscreen) drivers, the rest · Maintainers:
Michael Hennerich, Dmitry Torokhov, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2010-08-02 · Re: Fwd: [RFC] [PATCH] Input: ADP5588 - Support gpio function on unused pin · Hennerich, Michael <hidden>
- 2010-07-27 · Re: Fwd: [RFC] [PATCH] Input: ADP5588 - Support gpio function on unused pin · Xiaolong Chen <hidden>
- 2010-07-26 · Re: Fwd: [RFC] [PATCH] Input: ADP5588 - Support gpio function on unused pin · Dmitry Torokhov <dmitry.torokhov@gmail.com>
- 2010-07-26 · Re: Fwd: [RFC] [PATCH] Input: ADP5588 - Support gpio function on unused pin · Xiaolong Chen <hidden>
- 2010-07-20 · Re: Fwd: [RFC] [PATCH] Input: ADP5588 - Support gpio function on unused pin · Dmitry Torokhov <dmitry.torokhov@gmail.com>
Hi Dmitry, I took a look at the driver in your next tree. Two issues: -Avoid NULL pointer dereference in adp5588_gpio_add(), set clientdata before call to adp5588_gpio_add(). -Avoid NULL pointer dereference, exit if gpio_data doesn't exist Signed-off-by: Michael Hennerich <redacted> drivers/input/keyboard/adp5588-keys.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c
index c39ec93..456bba7 100644
--- a/drivers/input/keyboard/adp5588-keys.c
+++ b/drivers/input/keyboard/adp5588-keys.c@@ -201,6 +201,9 @@ static int __devinit adp5588_gpio_add(struct device *dev) if (kpad->gc.ngpio) kpad->export_gpio = true; + } else { + kpad->export_gpio = false; + return 0; } if (!kpad->export_gpio) {
@@ -581,12 +584,13 @@ static int __devinit adp5588_probe(struct i2c_client *client, if (kpad->gpimapsize) adp5588_report_switch_state(kpad); + i2c_set_clientdata(client, kpad); + error = adp5588_gpio_add(&client->dev); if (error) goto err_free_irq; device_init_wakeup(&client->dev, 1); - i2c_set_clientdata(client, kpad); dev_info(&client->dev, "Rev.%d keypad, irq %d\n", revid, client->irq); return 0;
Greetings, Michael Analog Devices GmbH Wilhelm-Wagenfeld-Str. 6 80807 Muenchen Sitz der Gesellschaft Muenchen, Registergericht Muenchen HRB 4036 Geschaeftsfuehrer Thomas Wessel, William A. Martin, Margaret Seif