git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha...
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
video
/
mt9m001.c
diff --git
a/drivers/media/video/mt9m001.c
b/drivers/media/video/mt9m001.c
index 992ab8cb89ae0bc59671b4cb57f1d0617e484002..79f096ddcf5def01671ef05af5fe8abcad4c8878 100644
(file)
--- a/
drivers/media/video/mt9m001.c
+++ b/
drivers/media/video/mt9m001.c
@@
-785,7
+785,6
@@
static int mt9m001_probe(struct i2c_client *client,
ret = mt9m001_video_probe(icd, client);
if (ret) {
icd->ops = NULL;
- i2c_set_clientdata(client, NULL);
kfree(mt9m001);
}
@@
-799,7
+798,6
@@
static int mt9m001_remove(struct i2c_client *client)
icd->ops = NULL;
mt9m001_video_remove(icd);
- i2c_set_clientdata(client, NULL);
client->driver = NULL;
kfree(mt9m001);