Merge tag 'leds_for_4.10_email_update' of git://git.kernel.org/pub/scm/linux/kernel...

[mirror_ubuntu-zesty-kernel.git] / drivers / media / usb / pwc / pwc-v4l.c

diff --git a/drivers/media/usb/pwc/pwc-v4l.c b/drivers/media/usb/pwc/pwc-v4l.c
index 3d987984602f1bad2042a778aeef9b79c39dab32..92f04db6bbae6e39cfee6b7ae3febc159a21226a 100644 (file)
--- a/drivers/media/usb/pwc/pwc-v4l.c
+++ b/drivers/media/usb/pwc/pwc-v4l.c
@@ -406,8 +406,7 @@ static void pwc_vidioc_fill_fmt(struct v4l2_format *f,
        f->fmt.pix.bytesperline = f->fmt.pix.width;
        f->fmt.pix.sizeimage    = f->fmt.pix.height * f->fmt.pix.width * 3 / 2;
        f->fmt.pix.colorspace   = V4L2_COLORSPACE_SRGB;
-       PWC_DEBUG_IOCTL("pwc_vidioc_fill_fmt() "
-                       "width=%d, height=%d, bytesperline=%d, sizeimage=%d, pixelformat=%c%c%c%c\n",
+       PWC_DEBUG_IOCTL("pwc_vidioc_fill_fmt() width=%d, height=%d, bytesperline=%d, sizeimage=%d, pixelformat=%c%c%c%c\n",
                        f->fmt.pix.width,
                        f->fmt.pix.height,
                        f->fmt.pix.bytesperline,
@@ -473,8 +472,7 @@ static int pwc_s_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f)
 
        pixelformat = f->fmt.pix.pixelformat;
 
-       PWC_DEBUG_IOCTL("Trying to set format to: width=%d height=%d fps=%d "
-                       "format=%c%c%c%c\n",
+       PWC_DEBUG_IOCTL("Trying to set format to: width=%d height=%d fps=%d format=%c%c%c%c\n",
                        f->fmt.pix.width, f->fmt.pix.height, pdev->vframes,
                        (pixelformat)&255,
                        (pixelformat>>8)&255,