mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c: Remove all i2c_set_clientdata(client, NULL) in drivers i2c/busses: Move two drivers to embedded section i2c: Rename i2c_check_addr to i2c_check_addr_busy i2c: Document reserved I2C addresses i2c: Check for address validity on client registration i2c: Share the I2C device presence detection code Documentation/i2c: Checkpatch cleanup
This commit is contained in:
commit
ceadda057c
85 changed files with 191 additions and 287 deletions
|
|
@ -234,7 +234,6 @@ static int __devexit pismo_remove(struct i2c_client *client)
|
|||
/* FIXME: set_vpp needs saner arguments */
|
||||
pismo_setvpp_remove_fix(pismo);
|
||||
|
||||
i2c_set_clientdata(client, NULL);
|
||||
kfree(pismo);
|
||||
|
||||
return 0;
|
||||
|
|
@ -286,7 +285,6 @@ static int __devinit pismo_probe(struct i2c_client *client,
|
|||
return 0;
|
||||
|
||||
exit_free:
|
||||
i2c_set_clientdata(client, NULL);
|
||||
kfree(pismo);
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue