diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-07-17 07:41:50 +0200 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-07-17 07:41:50 +0200 |
| commit | f4b6f27da34d8971eb4b59324c15e94bd062ed21 (patch) | |
| tree | 980fd0be0d0ac3c0606b8b0d6d61b9404bdb67dc /linux/drivers/media/video/cx18/cx18-ioctl.c | |
| parent | 2c89d265e6b6dc34bdb2c616731e33e9591088f5 (diff) | |
| parent | 610e9fdc6f1ffa937eb4e499f202ea75deb1ff03 (diff) | |
| download | mediapointer-dvb-s2-f4b6f27da34d8971eb4b59324c15e94bd062ed21.tar.gz mediapointer-dvb-s2-f4b6f27da34d8971eb4b59324c15e94bd062ed21.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-ioctl.c')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-ioctl.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-ioctl.c b/linux/drivers/media/video/cx18/cx18-ioctl.c index b3d72d4a4..0221a67aa 100644 --- a/linux/drivers/media/video/cx18/cx18-ioctl.c +++ b/linux/drivers/media/video/cx18/cx18-ioctl.c @@ -821,8 +821,10 @@ static int cx18_log_status(struct file *file, void *fh) cx18_get_audio_input(cx, cx->audio_input, &audin); CX18_INFO("Video Input: %s\n", vidin.name); CX18_INFO("Audio Input: %s\n", audin.name); + mutex_lock(&cx->gpio_lock); CX18_INFO("GPIO: direction 0x%08x, value 0x%08x\n", cx->gpio_dir, cx->gpio_val); + mutex_unlock(&cx->gpio_lock); CX18_INFO("Tuner: %s\n", test_bit(CX18_F_I_RADIO_USER, &cx->i_flags) ? "Radio" : "TV"); cx2341x_log_status(&cx->params, cx->name); @@ -857,6 +859,15 @@ static int cx18_default(struct file *file, void *fh, int cmd, void *arg) cx18_audio_set_route(cx, route); break; } + + case VIDIOC_INT_RESET: { + u32 val = *(u32 *)arg; + + if ((val == 0) || (val & 0x01)) + cx18_reset_ir_gpio(&cx->i2c_algo_cb_data[0]); + break; + } + default: return -EINVAL; } |