diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-06-26 17:24:05 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-26 23:17:40 -0400 |
commit | 99eb44fe941b35b28914881774515005fa2ab7f6 (patch) | |
tree | d76716309716fcb5be999a956d546349d02b866f /drivers/media/video/cx88 | |
parent | 4d6b5aee9d19d1a982d9db0b5ffea20ee94816c6 (diff) |
V4L/DVB (4259): Pass an explicit log prefix to cx2341x_log_status
A card number is not unique enough. Instead, let the caller specify the
prefix of the status messages.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx88')
-rw-r--r-- | drivers/media/video/cx88/cx88-blackbird.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c index a7893a6eb58e..4ff81582ec56 100644 --- a/drivers/media/video/cx88/cx88-blackbird.c +++ b/drivers/media/video/cx88/cx88-blackbird.c | |||
@@ -854,13 +854,18 @@ static int mpeg_do_ioctl(struct inode *inode, struct file *file, | |||
854 | return 0; | 854 | return 0; |
855 | } | 855 | } |
856 | case VIDIOC_LOG_STATUS: | 856 | case VIDIOC_LOG_STATUS: |
857 | { | ||
858 | char name[32 + 2]; | ||
859 | |||
860 | snprintf(name, sizeof(name), "%s/2", core->name); | ||
857 | printk("%s/2: ============ START LOG STATUS ============\n", | 861 | printk("%s/2: ============ START LOG STATUS ============\n", |
858 | core->name); | 862 | core->name); |
859 | cx88_call_i2c_clients(core, VIDIOC_LOG_STATUS, 0); | 863 | cx88_call_i2c_clients(core, VIDIOC_LOG_STATUS, 0); |
860 | cx2341x_log_status(&dev->params, dev->mpeg_dev->minor); | 864 | cx2341x_log_status(&dev->params, name); |
861 | printk("%s/2: ============= END LOG STATUS =============\n", | 865 | printk("%s/2: ============= END LOG STATUS =============\n", |
862 | core->name); | 866 | core->name); |
863 | return 0; | 867 | return 0; |
868 | } | ||
864 | 869 | ||
865 | default: | 870 | default: |
866 | return cx88_do_ioctl(inode, file, 0, dev->core, cmd, arg, mpeg_do_ioctl); | 871 | return cx88_do_ioctl(inode, file, 0, dev->core, cmd, arg, mpeg_do_ioctl); |