diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-27 15:53:00 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-27 15:53:00 -0300 |
| commit | 2ba29f04ef6c89b77c469257ed249a94c52b8871 (patch) | |
| tree | 3e539f588e3266b11d5f949cd7891c81a7407372 /linux/drivers/media/video/bt8xx | |
| parent | 5f623f9662748ffe9662ee5b0561fe746ef3279d (diff) | |
| parent | 9c9fd460173573929daf32f42a502283a9aaae26 (diff) | |
| download | mediapointer-dvb-s2-2ba29f04ef6c89b77c469257ed249a94c52b8871.tar.gz mediapointer-dvb-s2-2ba29f04ef6c89b77c469257ed249a94c52b8871.tar.bz2 | |
merge: http://kernellabs.com/hg/~dheitmueller/dvb-frontend-exit-fix
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/bt8xx')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-driver.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-i2c.c | 23 |
2 files changed, 23 insertions, 1 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-driver.c b/linux/drivers/media/video/bt8xx/bttv-driver.c index 622807b54..8d2075186 100644 --- a/linux/drivers/media/video/bt8xx/bttv-driver.c +++ b/linux/drivers/media/video/bt8xx/bttv-driver.c @@ -4198,7 +4198,6 @@ static struct video_device *vdev_init(struct bttv *btv, if (NULL == vfd) return NULL; *vfd = *template; - vfd->minor = -1; vfd->v4l2_dev = &btv->c.v4l2_dev; vfd->release = video_device_release; vfd->debug = bttv_debug; diff --git a/linux/drivers/media/video/bt8xx/bttv-i2c.c b/linux/drivers/media/video/bt8xx/bttv-i2c.c index bf94551c3..4febaf881 100644 --- a/linux/drivers/media/video/bt8xx/bttv-i2c.c +++ b/linux/drivers/media/video/bt8xx/bttv-i2c.c @@ -405,6 +405,29 @@ int __devinit init_bttv_i2c(struct bttv *btv) } if (0 == btv->i2c_rc && i2c_scan) do_i2c_scan(btv->c.v4l2_dev.name, &btv->i2c_client); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) + + /* Instantiate the IR receiver device, if present */ + if (0 == btv->i2c_rc) { + struct i2c_board_info info; + /* The external IR receiver is at i2c address 0x34 (0x35 for + reads). Future Hauppauge cards will have an internal + receiver at 0x30 (0x31 for reads). In theory, both can be + fitted, and Hauppauge suggest an external overrides an + internal. + + That's why we probe 0x1a (~0x34) first. CB + */ + const unsigned short addr_list[] = { + 0x1a, 0x18, 0x4b, 0x64, 0x30, + I2C_CLIENT_END + }; + + memset(&info, 0, sizeof(struct i2c_board_info)); + strlcpy(info.type, "ir_video", I2C_NAME_SIZE); + i2c_new_probed_device(&btv->c.i2c_adap, &info, addr_list); + } +#endif return btv->i2c_rc; } |