From 02ea3b64fad86538987ddc48d7179aaca9789210 Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Mon, 24 Jan 2011 11:44:29 +0100 Subject: [PATCH] --- yaml --- r: 235715 b: refs/heads/master c: dc7b202a4ee6cb686e2bbef80c84443f43ec91bd h: refs/heads/master i: 235713: 448a322391703e03557d19fd8ace5b57cf0b595a 235711: ac8114a02672cbfdab8fc73c103d25646ccee951 v: v3 --- [refs] | 2 +- trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 24aa0ba349dc..8721fc606b2a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5673db40e28732431b1d3c6433638408f913142e +refs/heads/master: dc7b202a4ee6cb686e2bbef80c84443f43ec91bd diff --git a/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c b/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c index f69d3a34190a..fa1ee9d11888 100644 --- a/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c +++ b/trunk/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);