diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-07 11:45:08 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 17:42:42 +0200 |
| commit | d30e21ddcdc948ecedfb46a0ed021d57f310a6f3 (patch) | |
| tree | 0371028c041f15e0a4067fcc4b748a8a60ac0769 | |
| parent | V4L/DVB (10497): saa7146: i2c adapdata now points to v4l2_device. (diff) | |
| download | linux-d30e21ddcdc948ecedfb46a0ed021d57f310a6f3.tar.xz linux-d30e21ddcdc948ecedfb46a0ed021d57f310a6f3.zip | |
V4L/DVB (10498): saa7146: the adapter class will be NULL when v4l2_subdev is used.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/common/saa7146_i2c.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c index 1b64074a92da..76229f992275 100644 --- 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; |