Преглед на файлове

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>
Mike Isely преди 19 години
родител
ревизия
4f1a3e5bc4
променени са 2 файла, в които са добавени 3 реда и са изтрити 4 реда
  1. 3 0
      drivers/media/video/pvrusb2/pvrusb2-hdw.c
  2. 0 4
      drivers/media/video/pvrusb2/pvrusb2-v4l2.c

+ 3 - 0
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);
 }
 

+ 0 - 4
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;
 	}