diff options
author | Andy Walls <awalls@radix.net> | 2008-07-13 18:05:25 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 06:24:59 -0400 |
commit | 8abdd00dcc6a58cab3afe6a23a0ce819dc08049a (patch) | |
tree | e12468caf7a74379a5833827f6b83ea77d37df0c /drivers/media/video/cx18/cx18-ioctl.c | |
parent | 2c6a37bb076b9718c6362d4ffa1c7e58fdb1a0e9 (diff) |
V4L/DVB (8331): cx18: Add locking for struct cx18 GPIO state variables
cx18: Add locking for struct cx18 GPIO state variables in
anticpation of adding IR microcontroller reset support for
use by external IR modules.
Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx18/cx18-ioctl.c')
-rw-r--r-- | drivers/media/video/cx18/cx18-ioctl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c index 6eaf77b99e9d..146a4b856496 100644 --- a/drivers/media/video/cx18/cx18-ioctl.c +++ b/drivers/media/video/cx18/cx18-ioctl.c | |||
@@ -716,8 +716,10 @@ static int cx18_log_status(struct file *file, void *fh) | |||
716 | cx18_get_audio_input(cx, cx->audio_input, &audin); | 716 | cx18_get_audio_input(cx, cx->audio_input, &audin); |
717 | CX18_INFO("Video Input: %s\n", vidin.name); | 717 | CX18_INFO("Video Input: %s\n", vidin.name); |
718 | CX18_INFO("Audio Input: %s\n", audin.name); | 718 | CX18_INFO("Audio Input: %s\n", audin.name); |
719 | mutex_lock(&cx->gpio_lock); | ||
719 | CX18_INFO("GPIO: direction 0x%08x, value 0x%08x\n", | 720 | CX18_INFO("GPIO: direction 0x%08x, value 0x%08x\n", |
720 | cx->gpio_dir, cx->gpio_val); | 721 | cx->gpio_dir, cx->gpio_val); |
722 | mutex_unlock(&cx->gpio_lock); | ||
721 | CX18_INFO("Tuner: %s\n", | 723 | CX18_INFO("Tuner: %s\n", |
722 | test_bit(CX18_F_I_RADIO_USER, &cx->i_flags) ? "Radio" : "TV"); | 724 | test_bit(CX18_F_I_RADIO_USER, &cx->i_flags) ? "Radio" : "TV"); |
723 | cx2341x_log_status(&cx->params, cx->name); | 725 | cx2341x_log_status(&cx->params, cx->name); |