kernel: bump 4.19 to 4.19.62

[openwrt/openwrt.git] / target / linux / brcm2708 / patches-4.19 / 950-0251-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch

diff --git a/target/linux/brcm2708/patches-4.19/950-0251-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch b/target/linux/brcm2708/patches-4.19/950-0251-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch
index 965261fd0b2c99c833a751903211919b11e744c7..133184945794a7e0bfb93c47b00013b0e33e6411 100644 (file)
--- a/target/linux/brcm2708/patches-4.19/950-0251-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch
+++ b/target/linux/brcm2708/patches-4.19/950-0251-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch
@@ -17,7 +17,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
 
 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
 +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-@@ -412,8 +412,7 @@ static void buffer_cb(struct vchiq_mmal_
+@@ -415,8 +415,7 @@ static void buffer_cb(struct vchiq_mmal_
                buf->vb.flags |= V4L2_BUF_FLAG_KEYFRAME;
  
        v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
@@ -27,7 +27,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
        vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
  
        if (mmal_flags & MMAL_BUFFER_HEADER_FLAG_EOS &&
-@@ -581,8 +580,8 @@ static int start_streaming(struct vb2_qu
+@@ -584,8 +583,8 @@ static int start_streaming(struct vb2_qu
            vchiq_mmal_port_enable(dev->instance, dev->capture.port, buffer_cb);
        if (ret) {
                v4l2_err(&dev->v4l2_dev,
@@ -38,7 +38,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  
                vchiq_mmal_port_disable(dev->instance,
                                        dev->capture.camera_port);
-@@ -978,8 +977,7 @@ static int vidioc_try_fmt_vid_cap(struct
+@@ -991,8 +990,7 @@ static int vidioc_try_fmt_vid_cap(struct
                f->fmt.pix.bytesperline =
                        (f->fmt.pix.bytesperline + align_mask) & ~align_mask;
                v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
@@ -48,7 +48,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
                         f->fmt.pix.bytesperline, align_mask);
        }
  
-@@ -1325,7 +1323,7 @@ static int vidioc_s_fmt_vid_cap(struct f
+@@ -1338,7 +1336,7 @@ static int vidioc_s_fmt_vid_cap(struct f
  }
  
  static int vidioc_enum_framesizes(struct file *file, void *fh,
@@ -104,7 +104,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
                case MMAL_CONTROL_TYPE_CLUSTER:
 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
-@@ -645,7 +645,7 @@ static int send_synchronous_mmal_msg(str
+@@ -651,7 +651,7 @@ static int send_synchronous_mmal_msg(str
        if (payload_len >
            (MMAL_MSG_MAX_SIZE - sizeof(struct mmal_msg_header))) {
                pr_err("payload length %d exceeds max:%d\n", payload_len,
@@ -115,7 +115,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
        }
 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h
 +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h
-@@ -128,7 +128,7 @@ int vchiq_mmal_port_enable(
+@@ -131,7 +131,7 @@ int vchiq_mmal_port_enable(
   * disable a port will dequeue any pending buffers
   */
  int vchiq_mmal_port_disable(struct vchiq_mmal_instance *instance,
@@ -124,7 +124,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  
  int vchiq_mmal_port_parameter_set(struct vchiq_mmal_instance *instance,
                                  struct vchiq_mmal_port *port,
-@@ -146,8 +146,8 @@ int vchiq_mmal_port_set_format(struct vc
+@@ -149,8 +149,8 @@ int vchiq_mmal_port_set_format(struct vc
                               struct vchiq_mmal_port *port);
  
  int vchiq_mmal_port_connect_tunnel(struct vchiq_mmal_instance *instance,