AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[media] cx2341x: mark printk continuation lines as such

Browse Source 
This driver has printk continuation lines for debugging purposes.

Since commit 563873318d ("Merge branch 'printk-cleanups'"),
this won't work as expected anymore. So, let's add KERN_CONT to
those lines.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Mauro Carvalho Chehab 2016-10-13 15:27:35 -03:00
parent 7887d3710b
commit 6dd23d4c95
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/common/cx2341x.c
View File

@ -1190,8 +1190,8 @@ void cx2341x_log_status(const struct cx2341x_mpeg_params *p, const char *prefix)
prefix, prefix,
cx2341x_menu_item(p, V4L2_CID_MPEG_STREAM_TYPE)); cx2341x_menu_item(p, V4L2_CID_MPEG_STREAM_TYPE));
if (p->stream_insert_nav_packets) if (p->stream_insert_nav_packets)
printk(" (with navigation packets)"); printk(KERN_CONT " (with navigation packets)");
printk("\n"); printk(KERN_CONT "\n");
printk(KERN_INFO "%s: VBI Format: %s\n", printk(KERN_INFO "%s: VBI Format: %s\n",
prefix, prefix,
cx2341x_menu_item(p, V4L2_CID_MPEG_STREAM_VBI_FMT)); cx2341x_menu_item(p, V4L2_CID_MPEG_STREAM_VBI_FMT));
@ -1209,8 +1209,8 @@ void cx2341x_log_status(const struct cx2341x_mpeg_params *p, const char *prefix)
cx2341x_menu_item(p, V4L2_CID_MPEG_VIDEO_BITRATE_MODE), cx2341x_menu_item(p, V4L2_CID_MPEG_VIDEO_BITRATE_MODE),
p->video_bitrate); p->video_bitrate);
if (p->video_bitrate_mode == V4L2_MPEG_VIDEO_BITRATE_MODE_VBR) if (p->video_bitrate_mode == V4L2_MPEG_VIDEO_BITRATE_MODE_VBR)
printk(", Peak %d", p->video_bitrate_peak); printk(KERN_CONT ", Peak %d", p->video_bitrate_peak);
printk("\n"); printk(KERN_CONT "\n");
printk(KERN_INFO printk(KERN_INFO
"%s: Video: GOP Size %d, %d B-Frames, %sGOP Closure\n", "%s: Video: GOP Size %d, %d B-Frames, %sGOP Closure\n",
prefix, prefix,
@ -1232,9 +1232,9 @@ void cx2341x_log_status(const struct cx2341x_mpeg_params *p, const char *prefix)
cx2341x_menu_item(p, V4L2_CID_MPEG_AUDIO_MODE), cx2341x_menu_item(p, V4L2_CID_MPEG_AUDIO_MODE),
p->audio_mute ? " (muted)" : ""); p->audio_mute ? " (muted)" : "");
if (p->audio_mode == V4L2_MPEG_AUDIO_MODE_JOINT_STEREO) if (p->audio_mode == V4L2_MPEG_AUDIO_MODE_JOINT_STEREO)
printk(", %s", cx2341x_menu_item(p, printk(KERN_CONT ", %s", cx2341x_menu_item(p,
V4L2_CID_MPEG_AUDIO_MODE_EXTENSION)); V4L2_CID_MPEG_AUDIO_MODE_EXTENSION));
printk(", %s, %s\n", printk(KERN_CONT ", %s, %s\n",
cx2341x_menu_item(p, V4L2_CID_MPEG_AUDIO_EMPHASIS), cx2341x_menu_item(p, V4L2_CID_MPEG_AUDIO_EMPHASIS),
cx2341x_menu_item(p, V4L2_CID_MPEG_AUDIO_CRC)); cx2341x_menu_item(p, V4L2_CID_MPEG_AUDIO_CRC));