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 git://git.infradead.org/mtd-2.6
[pandora-kernel.git]
/
drivers
/
media
/
video
/
cx18
/
cx18-i2c.c
diff --git
a/drivers/media/video/cx18/cx18-i2c.c
b/drivers/media/video/cx18/cx18-i2c.c
index
809f7d3
..
73ce90c
100644
(file)
--- a/
drivers/media/video/cx18/cx18-i2c.c
+++ b/
drivers/media/video/cx18/cx18-i2c.c
@@
-117,7
+117,8
@@
static int cx18_i2c_new_ir(struct cx18 *cx, struct i2c_adapter *adap, u32 hw,
break;
}
- return i2c_new_probed_device(adap, &info, addr_list) == NULL ? -1 : 0;
+ return i2c_new_probed_device(adap, &info, addr_list, NULL) == NULL ?
+ -1 : 0;
}
int cx18_i2c_register(struct cx18 *cx, unsigned idx)