提交 4f1a3e5b 编写于 作者: M Mike Isely 提交者: Mauro Carvalho Chehab

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

Signed-off-by: NMike Isely <isely@pobox.com>
Signed-off-by: NMauro Carvalho Chehab <mchehab@infradead.org>
上级 c05c0462
...@@ -2236,11 +2236,14 @@ struct pvr2_stream *pvr2_hdw_get_video_stream(struct pvr2_hdw *hp) ...@@ -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) void pvr2_hdw_trigger_module_log(struct pvr2_hdw *hdw)
{ {
int nr = pvr2_hdw_get_unit_number(hdw);
LOCK_TAKE(hdw->big_lock); do { LOCK_TAKE(hdw->big_lock); do {
hdw->log_requested = !0; hdw->log_requested = !0;
printk(KERN_INFO "pvrusb2: ================= START STATUS CARD #%d =================\n", nr);
pvr2_i2c_core_check_stale(hdw); pvr2_i2c_core_check_stale(hdw);
hdw->log_requested = 0; hdw->log_requested = 0;
pvr2_i2c_core_sync(hdw); pvr2_i2c_core_sync(hdw);
printk(KERN_INFO "pvrusb2: ================== END STATUS CARD #%d ==================\n", nr);
} while (0); LOCK_GIVE(hdw->big_lock); } while (0); LOCK_GIVE(hdw->big_lock);
} }
......
...@@ -578,11 +578,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file, ...@@ -578,11 +578,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
case VIDIOC_LOG_STATUS: 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); pvr2_hdw_trigger_module_log(hdw);
printk(KERN_INFO "pvrusb2: ================== END STATUS CARD #%d ==================\n", nr);
ret = 0; ret = 0;
break; break;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册