staging/ste_rmi4: Remove obsolete cleanup for clientdata
authorWolfram Sang <w.sang@pengutronix.de>
Mon, 24 Jan 2011 10:44:29 +0000 (11:44 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 25 Jan 2011 10:13:01 +0000 (18:13 +0800)
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 <w.sang@pengutronix.de>
Cc: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
Cc: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c

index f69d3a3..fa1ee9d 100644 (file)
@@ -987,7 +987,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 */
@@ -1009,8 +1009,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);