git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
drivers
/
staging
/
dream
/
synaptics_i2c_rmi.c
diff --git
a/drivers/staging/dream/synaptics_i2c_rmi.c
b/drivers/staging/dream/synaptics_i2c_rmi.c
index
1f020da
..
3320359
100644
(file)
--- a/
drivers/staging/dream/synaptics_i2c_rmi.c
+++ b/
drivers/staging/dream/synaptics_i2c_rmi.c
@@
-519,7
+519,6
@@
err_input_register_device_failed:
err_input_dev_alloc_failed:
err_detect_failed:
err_power_failed:
err_input_dev_alloc_failed:
err_detect_failed:
err_power_failed:
- i2c_set_clientdata(client, NULL);
kfree(ts);
err_alloc_data_failed:
err_check_functionality_failed:
kfree(ts);
err_alloc_data_failed:
err_check_functionality_failed:
@@
-537,7
+536,6
@@
static int synaptics_ts_remove(struct i2c_client *client)
else
hrtimer_cancel(&ts->timer);
input_unregister_device(ts->input_dev);
else
hrtimer_cancel(&ts->timer);
input_unregister_device(ts->input_dev);
- i2c_set_clientdata(client, NULL);
kfree(ts);
return 0;
}
kfree(ts);
return 0;
}