brcm2708: update to latest patches from RPi foundation

[openwrt/openwrt.git] / target / linux / brcm2708 / patches-4.19 / 950-0250-staging-bcm2835-camera-Fix-logical-continuation-spli.patch

diff --git a/target/linux/brcm2708/patches-4.19/950-0250-staging-bcm2835-camera-Fix-logical-continuation-spli.patch b/target/linux/brcm2708/patches-4.19/950-0250-staging-bcm2835-camera-Fix-logical-continuation-spli.patch
index a04ebef3b891100e0db329828ba9c39471880d2e..a47fd0f764058b95e9be169070372e37da21b682 100644 (file)
--- a/target/linux/brcm2708/patches-4.19/950-0250-staging-bcm2835-camera-Fix-logical-continuation-spli.patch
+++ b/target/linux/brcm2708/patches-4.19/950-0250-staging-bcm2835-camera-Fix-logical-continuation-spli.patch
@@ -1,7 +1,7 @@
-From b628d79fb130da3cbae59b4aaa14fbaf599a5e7c Mon Sep 17 00:00:00 2001
+From e0f8234cf59fcdcafe93bdfcf10409e46eb3853f Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Wed, 21 Feb 2018 15:48:54 +0000
-Subject: [PATCH 250/703] staging: bcm2835-camera: Fix logical continuation
+Subject: [PATCH 250/773] staging: bcm2835-camera: Fix logical continuation
  splits
 
 Fix checkpatch errors for "Logical continuations should be
@@ -14,7 +14,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
-@@ -542,8 +542,8 @@ static int start_streaming(struct vb2_qu
+@@ -545,8 +545,8 @@ static int start_streaming(struct vb2_qu
                msleep(300);
  
        /* enable the connection from camera to encoder (if applicable) */
@@ -25,7 +25,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
                ret = vchiq_mmal_port_enable(dev->instance,
                                             dev->capture.camera_port, NULL);
                if (ret) {
-@@ -1043,8 +1043,8 @@ static int mmal_setup_components(struct
+@@ -1056,8 +1056,8 @@ static int mmal_setup_components(struct
        switch (mfmt->mmal_component) {
        case COMP_CAMERA:
                /* Make a further decision on port based on resolution */
@@ -36,7 +36,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
                        camera_port = port =
                            &dev->component[COMP_CAMERA]->output[CAM_PORT_VIDEO];
                else
-@@ -1101,8 +1101,8 @@ static int mmal_setup_components(struct
+@@ -1114,8 +1114,8 @@ static int mmal_setup_components(struct
  
        ret = vchiq_mmal_port_set_format(dev->instance, camera_port);