From 709e7634199ccf9a2eca234f6ee87b10c5707d1c Mon Sep 17 00:00:00 2001 From: Mike Isely Date: Sun, 25 Jun 2006 20:04:31 -0300 Subject: [PATCH] --- yaml --- r: 30836 b: refs/heads/master c: 4f1a3e5bc4e541477729c2ab888c761342329920 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c | 3 +++ trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 4 ---- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 36904291164b..8549d0defb85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c05c0462da0e3aac70ec5316ea500f9a7499cca7 +refs/heads/master: 4f1a3e5bc4e541477729c2ab888c761342329920 diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c index e8ea472fe2d0..872705633048 100644 --- a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c @@ -2236,11 +2236,14 @@ struct pvr2_stream *pvr2_hdw_get_video_stream(struct pvr2_hdw *hp) void pvr2_hdw_trigger_module_log(struct pvr2_hdw *hdw) { + int nr = pvr2_hdw_get_unit_number(hdw); LOCK_TAKE(hdw->big_lock); do { hdw->log_requested = !0; + printk(KERN_INFO "pvrusb2: ================= START STATUS CARD #%d =================\n", nr); pvr2_i2c_core_check_stale(hdw); hdw->log_requested = 0; pvr2_i2c_core_sync(hdw); + printk(KERN_INFO "pvrusb2: ================== END STATUS CARD #%d ==================\n", nr); } while (0); LOCK_GIVE(hdw->big_lock); } diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index e93e2aa81f30..dda560cd1c06 100644 --- a/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c @@ -578,11 +578,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file, case VIDIOC_LOG_STATUS: { - int nr = pvr2_hdw_get_unit_number(hdw); - - printk(KERN_INFO "pvrusb2: ================= START STATUS CARD #%d =================\n", nr); pvr2_hdw_trigger_module_log(hdw); - printk(KERN_INFO "pvrusb2: ================== END STATUS CARD #%d ==================\n", nr); ret = 0; break; }