From 38f5a7e4b681e2cadd85789b47fbf73a4395b3bc Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sat, 7 Feb 2009 07:45:08 -0300 Subject: [PATCH] --- yaml --- r: 137854 b: refs/heads/master c: d30e21ddcdc948ecedfb46a0ed021d57f310a6f3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/common/saa7146_i2c.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f84c4092d24f..923a6588291f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45d809431daaa3ab01f877388d09676d05b469be +refs/heads/master: d30e21ddcdc948ecedfb46a0ed021d57f310a6f3 diff --git a/trunk/drivers/media/common/saa7146_i2c.c b/trunk/drivers/media/common/saa7146_i2c.c index 1b64074a92da..76229f992275 100644 --- a/trunk/drivers/media/common/saa7146_i2c.c +++ b/trunk/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;