projects
/
cascardo
/
linux.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...
[cascardo/linux.git]
/
drivers
/
media
/
video
/
ov9640.c
diff --git
a/drivers/media/video/ov9640.c
b/drivers/media/video/ov9640.c
index
58811c0
..
7ce9e05
100644
(file)
--- a/
drivers/media/video/ov9640.c
+++ b/
drivers/media/video/ov9640.c
@@
-783,7
+783,6
@@
static int ov9640_probe(struct i2c_client *client,
if (ret) {
icd->ops = NULL;
- i2c_set_clientdata(client, NULL);
kfree(priv);
}
@@
-794,7
+793,6
@@
static int ov9640_remove(struct i2c_client *client)
{
struct ov9640_priv *priv = i2c_get_clientdata(client);
- i2c_set_clientdata(client, NULL);
kfree(priv);
return 0;
}