diff options
Diffstat (limited to 'target/linux/brcm2708/patches-4.19/950-0247-staging-bcm2835-camera-Fix-multiple-line-dereference.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.19/950-0247-staging-bcm2835-camera-Fix-multiple-line-dereference.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0247-staging-bcm2835-camera-Fix-multiple-line-dereference.patch b/target/linux/brcm2708/patches-4.19/950-0247-staging-bcm2835-camera-Fix-multiple-line-dereference.patch index 217cce879b..8a34daa0b8 100644 --- a/target/linux/brcm2708/patches-4.19/950-0247-staging-bcm2835-camera-Fix-multiple-line-dereference.patch +++ b/target/linux/brcm2708/patches-4.19/950-0247-staging-bcm2835-camera-Fix-multiple-line-dereference.patch @@ -23,7 +23,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> } static void buffer_cb(struct vchiq_mmal_instance *instance, -@@ -782,8 +781,7 @@ static int vidioc_overlay(struct file *f +@@ -795,8 +794,7 @@ static int vidioc_overlay(struct file *f return 0; /* already in requested state */ src = @@ -33,7 +33,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> if (!on) { /* disconnect preview ports and disable component */ -@@ -840,8 +838,7 @@ static int vidioc_g_fbuf(struct file *fi +@@ -853,8 +851,7 @@ static int vidioc_g_fbuf(struct file *fi */ struct bm2835_mmal_dev *dev = video_drvdata(file); struct vchiq_mmal_port *preview_port = @@ -43,7 +43,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> a->capability = V4L2_FBUF_CAP_EXTERNOVERLAY | V4L2_FBUF_CAP_GLOBAL_ALPHA; -@@ -1033,8 +1030,7 @@ static int mmal_setup_components(struct +@@ -1046,8 +1043,7 @@ static int mmal_setup_components(struct dev->capture.camera_port, NULL); dev->capture.camera_port = NULL; ret = vchiq_mmal_component_disable(dev->instance, @@ -53,7 +53,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> if (ret) v4l2_err(&dev->v4l2_dev, "Failed to disable encode component %d\n", -@@ -1049,26 +1045,22 @@ static int mmal_setup_components(struct +@@ -1062,26 +1058,22 @@ static int mmal_setup_components(struct if (f->fmt.pix.width <= max_video_width && f->fmt.pix.height <= max_video_height) camera_port = port = @@ -84,7 +84,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> break; default: break; -@@ -1110,8 +1102,7 @@ static int mmal_setup_components(struct +@@ -1123,8 +1115,7 @@ static int mmal_setup_components(struct if (!ret && camera_port == @@ -94,7 +94,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> bool overlay_enabled = !!dev->component[COMP_PREVIEW]->enabled; struct vchiq_mmal_port *preview_port = -@@ -1248,9 +1239,8 @@ static int mmal_setup_components(struct +@@ -1261,9 +1252,8 @@ static int mmal_setup_components(struct port->current_buffer.size); port->current_buffer.size = (f->fmt.pix.sizeimage < @@ -106,7 +106,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> } v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev, -@@ -1709,8 +1699,7 @@ static int mmal_init(struct bm2835_mmal_ +@@ -1722,8 +1712,7 @@ static int mmal_init(struct bm2835_mmal_ /* get the video encoder component ready */ ret = vchiq_mmal_component_init(dev->instance, "ril.video_encode", @@ -116,7 +116,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> if (ret < 0) goto unreg_image_encoder; -@@ -1833,12 +1822,10 @@ static void bcm2835_cleanup_instance(str +@@ -1846,12 +1835,10 @@ static void bcm2835_cleanup_instance(str dev->component[COMP_CAMERA]); vchiq_mmal_component_finalise(dev->instance, |