]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
[media] cx2341x: mark printk continuation lines as such
authorMauro Carvalho Chehab <mchehab@s-opensource.com>
Thu, 13 Oct 2016 18:27:35 +0000 (15:27 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Fri, 21 Oct 2016 10:51:30 +0000 (08:51 -0200)
This driver has printk continuation lines for debugging purposes.

Since commit 563873318d32 ("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>
drivers/media/common/cx2341x.c

index 5e4afa0131e6847df1268b10ffbdafeed551c025..2725702eda7b97bccda06dd3768023a62b3392a7 100644 (file)
@@ -1190,8 +1190,8 @@ void cx2341x_log_status(const struct cx2341x_mpeg_params *p, const char *prefix)
                prefix,
                cx2341x_menu_item(p, V4L2_CID_MPEG_STREAM_TYPE));
        if (p->stream_insert_nav_packets)
-               printk(" (with navigation packets)");
-       printk("\n");
+               printk(KERN_CONT " (with navigation packets)");
+       printk(KERN_CONT "\n");
        printk(KERN_INFO "%s: VBI Format: %s\n",
                prefix,
                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),
                p->video_bitrate);
        if (p->video_bitrate_mode == V4L2_MPEG_VIDEO_BITRATE_MODE_VBR)
-               printk(", Peak %d", p->video_bitrate_peak);
-       printk("\n");
+               printk(KERN_CONT ", Peak %d", p->video_bitrate_peak);
+       printk(KERN_CONT "\n");
        printk(KERN_INFO
                "%s: Video:  GOP Size %d, %d B-Frames, %sGOP Closure\n",
                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),
                p->audio_mute ? " (muted)" : "");
        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));
-       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_CRC));