projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[deliverable/linux.git]
/
drivers
/
staging
/
go7007
/
wis-saa7113.c
diff --git
a/drivers/staging/go7007/wis-saa7113.c
b/drivers/staging/go7007/wis-saa7113.c
index bd925457f8b710ec8b44a86b7a32dddc22d0abfd..72f5c1f56d195f9c777ba09106b829f1814b9de0 100644
(file)
--- a/
drivers/staging/go7007/wis-saa7113.c
+++ b/
drivers/staging/go7007/wis-saa7113.c
@@
-289,7
+289,6
@@
static int wis_saa7113_probe(struct i2c_client *client,
if (write_regs(client, initial_registers) < 0) {
printk(KERN_ERR
"wis-saa7113: error initializing SAA7113\n");
if (write_regs(client, initial_registers) < 0) {
printk(KERN_ERR
"wis-saa7113: error initializing SAA7113\n");
- i2c_set_clientdata(client, NULL);
kfree(dec);
return -ENODEV;
}
kfree(dec);
return -ENODEV;
}
@@
-301,7
+300,6
@@
static int wis_saa7113_remove(struct i2c_client *client)
{
struct wis_saa7113 *dec = i2c_get_clientdata(client);
{
struct wis_saa7113 *dec = i2c_get_clientdata(client);
- i2c_set_clientdata(client, NULL);
kfree(dec);
return 0;
}
kfree(dec);
return 0;
}
This page took
0.024719 seconds
and
5
git commands to generate.