OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
45d8094
)
V4L/DVB (10498): saa7146: the adapter class will be NULL when v4l2_subdev is used.
author
Hans Verkuil
<hverkuil@xs4all.nl>
Sat, 7 Feb 2009 10:45:08 +0000
(07:45 -0300)
committer
Mauro Carvalho Chehab
<mchehab@redhat.com>
Mon, 30 Mar 2009 15:42:42 +0000
(12:42 -0300)
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/common/saa7146_i2c.c
patch
|
blob
|
history
diff --git
a/drivers/media/common/saa7146_i2c.c
b/drivers/media/common/saa7146_i2c.c
index
1b64074
..
76229f9
100644
(file)
--- a/
drivers/media/common/saa7146_i2c.c
+++ b/
drivers/media/common/saa7146_i2c.c
@@
-418,8
+418,7
@@
int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c
dev->i2c_bitrate = bitrate;
saa7146_i2c_reset(dev);
- if( NULL != i2c_adapter ) {
- BUG_ON(!i2c_adapter->class);
+ if (i2c_adapter) {
i2c_set_adapdata(i2c_adapter, &dev->v4l2_dev);
i2c_adapter->dev.parent = &dev->pci->dev;
i2c_adapter->algo = &saa7146_algo;