A few new i2c-drivers came into the kernel which clear the clientdata-pointer
on exit or error. This is obsolete meanwhile, the core will do it.

Signed-off-by: Wolfram Sang <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Naveen Kumar Gaddipati <[email protected]>
Cc: Linus Walleij <[email protected]>
---

Compile tested only.

 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c 
b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
index e8f047e..c9207de 100644
--- a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
+++ b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
@@ -989,7 +989,7 @@ static int __devinit synaptics_rmi4_probe
        retval = input_register_device(rmi4_data->input_dev);
        if (retval) {
                dev_err(&client->dev, "%s:input register failed\n", __func__);
-               goto err_input_register;
+               goto err_query_dev;
        }
 
        /* Clear interrupts */
@@ -1011,8 +1011,6 @@ static int __devinit synaptics_rmi4_probe
 err_request_irq:
        free_irq(platformdata->irq_number, rmi4_data);
        input_unregister_device(rmi4_data->input_dev);
-err_input_register:
-       i2c_set_clientdata(client, NULL);
 err_query_dev:
        if (platformdata->regulator_en) {
                regulator_disable(rmi4_data->regulator);
-- 
1.7.2.3

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

Reply via email to