From: Wolfram Sang Date: Mon, 24 Jan 2011 10:44:29 +0000 (+0100) Subject: staging/ste_rmi4: Remove obsolete cleanup for clientdata X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dc7b202a4ee6cb686e2bbef80c84443f43ec91bd;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git 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 Cc: Naveen Kumar Gaddipati Cc: Linus Walleij Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c index f69d3a34190a..fa1ee9d11888 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);