diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-30 01:04:44 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-30 01:04:44 +0200 |
| commit | 1784ea5527ed756f946958f45f74d1f15797c366 (patch) | |
| tree | 8126fc8bf73357835aca910bb3d95be555e7af7e /linux/drivers/media/common | |
| parent | 221b2e5d87ca670a9b764323c59445f1b6e3df27 (diff) | |
| download | mediapointer-dvb-s2-1784ea5527ed756f946958f45f74d1f15797c366.tar.gz mediapointer-dvb-s2-1784ea5527ed756f946958f45f74d1f15797c366.tar.bz2 | |
v4l2: use old-style i2c API for kernels < 2.6.26 instead of < 2.6.22
From: Hans Verkuil <hverkuil@xs4all.nl>
Originally the intention was to switch to the new style i2c API starting with
the introduction of the API in 2.6.22. However, the i2c_new_probed_device()
function has a lethal bug that wasn't fixed until 2.6.25. Or more accurately,
it was only fixed in the stable series of 2.6.25 and 2.6.26.
Given the fact that the new i2c API also changed starting with 2.6.26 (the
addition of i2c_device_id), it is easiest to switch APIs starting with
2.6.26.
This patch updates all the legacy code accordingly.
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/common')
| -rw-r--r-- | linux/drivers/media/common/saa7146_i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/common/saa7146_i2c.c b/linux/drivers/media/common/saa7146_i2c.c index fa9d4f90a..fc2c95a16 100644 --- a/linux/drivers/media/common/saa7146_i2c.c +++ b/linux/drivers/media/common/saa7146_i2c.c @@ -414,8 +414,8 @@ 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 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) + /* For kernels > 2.6.26 it can actually be NULL when v4l2_subdev is used. */ BUG_ON(!i2c_adapter->class); #endif |