V4L/DVB (4237): Move LOG_STATUS bracketing to a different part of the pvrusb2 driver

Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 3 insertions, 4 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index e8ea472fe2d0..872705633048 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/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/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index e93e2aa81f30..dda560cd1c06 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/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;
         }