aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/ste_rmi4
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2011-01-24 10:44:29 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2011-01-25 10:13:01 (GMT)
commitdc7b202a4ee6cb686e2bbef80c84443f43ec91bd (patch)
tree9616d5a0ac417728edd313013c0cd4b27226cad6 /drivers/staging/ste_rmi4
parent5673db40e28732431b1d3c6433638408f913142e (diff)
staging/ste_rmi4: Remove obsolete cleanup for clientdata
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>
Diffstat (limited to 'drivers/staging/ste_rmi4')
-rw-r--r--drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c4
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 f69d3a3..fa1ee9d 100644
--- a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
+++ b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
@@ -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);

Privacy Policy