summaryrefslogtreecommitdiff
path: root/drivers/media/video/cx88
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2006-06-26 18:24:05 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-27 00:17:40 -0300
commit99eb44fe941b35b28914881774515005fa2ab7f6 (patch)
treed76716309716fcb5be999a956d546349d02b866f /drivers/media/video/cx88
parent4d6b5aee9d19d1a982d9db0b5ffea20ee94816c6 (diff)
downloadlinux-99eb44fe941b35b28914881774515005fa2ab7f6.tar.gz
linux-99eb44fe941b35b28914881774515005fa2ab7f6.tar.xz
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.c7
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,
return 0;
}
case VIDIOC_LOG_STATUS:
+ {
+ char name[32 + 2];
+
+ snprintf(name, sizeof(name), "%s/2", core->name);
printk("%s/2: ============ START LOG STATUS ============\n",
core->name);
cx88_call_i2c_clients(core, VIDIOC_LOG_STATUS, 0);
- cx2341x_log_status(&dev->params, dev->mpeg_dev->minor);
+ cx2341x_log_status(&dev->params, name);
printk("%s/2: ============= END LOG STATUS =============\n",
core->name);
return 0;
+ }
default:
return cx88_do_ioctl(inode, file, 0, dev->core, cmd, arg, mpeg_do_ioctl);