diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-07 07:45:08 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 12:42:42 -0300 |
| commit | d30e21ddcdc948ecedfb46a0ed021d57f310a6f3 (patch) | |
| tree | 0371028c041f15e0a4067fcc4b748a8a60ac0769 /drivers/media/common/saa7146_i2c.c | |
| parent | 45d809431daaa3ab01f877388d09676d05b469be (diff) | |
| download | kernel_samsung_espresso10-d30e21ddcdc948ecedfb46a0ed021d57f310a6f3.tar.gz kernel_samsung_espresso10-d30e21ddcdc948ecedfb46a0ed021d57f310a6f3.tar.bz2 kernel_samsung_espresso10-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>
Diffstat (limited to 'drivers/media/common/saa7146_i2c.c')
| -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 1b64074a92d..76229f99227 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; |