diff options
| author | Mike Isely <isely@pobox.com> | 2006-06-25 18:04:31 -0500 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2006-06-25 18:04:31 -0500 |
| commit | 3b5520de57f512674e3c4814cbec2431d5399180 (patch) | |
| tree | 6b26b75177d7b0a52dbe91df6cf39236aaebddc9 | |
| parent | bde11288545f00f87f41f5c68269ff0e4f297f8b (diff) | |
| download | mediapointer-dvb-s2-3b5520de57f512674e3c4814cbec2431d5399180.tar.gz mediapointer-dvb-s2-3b5520de57f512674e3c4814cbec2431d5399180.tar.bz2 | |
Move LOG_STATUS bracketing to a different part of the pvrusb2 driver
From: Mike Isely <isely@pobox.com>
Signed-off-by: Mike Isely <isely@pobox.com>
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c index ba752ac73..a57be89c3 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c @@ -2237,11 +2237,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/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index c82c3abad..123895d6f 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c @@ -594,11 +594,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; } |