diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-07 05:45:08 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:42:42 -0400 |
| commit | d30e21ddcdc948ecedfb46a0ed021d57f310a6f3 (patch) | |
| tree | 0371028c041f15e0a4067fcc4b748a8a60ac0769 | |
| parent | 45d809431daaa3ab01f877388d09676d05b469be (diff) | |
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 | |||
| 418 | dev->i2c_bitrate = bitrate; | 418 | dev->i2c_bitrate = bitrate; |
| 419 | saa7146_i2c_reset(dev); | 419 | saa7146_i2c_reset(dev); |
| 420 | 420 | ||
| 421 | if( NULL != i2c_adapter ) { | 421 | if (i2c_adapter) { |
| 422 | BUG_ON(!i2c_adapter->class); | ||
| 423 | i2c_set_adapdata(i2c_adapter, &dev->v4l2_dev); | 422 | i2c_set_adapdata(i2c_adapter, &dev->v4l2_dev); |
| 424 | i2c_adapter->dev.parent = &dev->pci->dev; | 423 | i2c_adapter->dev.parent = &dev->pci->dev; |
| 425 | i2c_adapter->algo = &saa7146_algo; | 424 | i2c_adapter->algo = &saa7146_algo; |