diff options
| author | Michael Krufky <mkrufky@kernellabs.com> | 2009-09-15 11:14:17 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@kernellabs.com> | 2009-09-15 11:14:17 -0400 |
| commit | b0d1e983e98ec9b72146c16d08b3409a418c62df (patch) | |
| tree | b61e50f54f11599f31b476c477a69883597f5fad /linux/drivers/media/common/saa7146_i2c.c | |
| parent | 2c16279409d239adbbc884a308e71264ea02ef46 (diff) | |
| parent | 219fe38bd79dab42db83cacc1f5444d0e27fa8ea (diff) | |
| download | mediapointer-dvb-s2-b0d1e983e98ec9b72146c16d08b3409a418c62df.tar.gz mediapointer-dvb-s2-b0d1e983e98ec9b72146c16d08b3409a418c62df.tar.bz2 | |
merge: ~mkrufky/tda18271
From: Michael Krufky <mkrufky@kernellabs.com>
Priority: normal
Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
Diffstat (limited to 'linux/drivers/media/common/saa7146_i2c.c')
| -rw-r--r-- | linux/drivers/media/common/saa7146_i2c.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/common/saa7146_i2c.c b/linux/drivers/media/common/saa7146_i2c.c index fa9d4f90a..ce4f102ad 100644 --- a/linux/drivers/media/common/saa7146_i2c.c +++ b/linux/drivers/media/common/saa7146_i2c.c @@ -414,9 +414,9 @@ int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c saa7146_i2c_reset(dev); if (i2c_adapter) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22) - /* For kernels > 2.6.22 it can actually be NULL - when v4l2_subdev is used. */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) + /* For kernels >= 2.6.26 the class field is actually + always 0, so only do this test for older kernels. */ BUG_ON(!i2c_adapter->class); #endif i2c_set_adapdata(i2c_adapter, &dev->v4l2_dev); |