diff options
Diffstat (limited to 'target/linux/brcm2708/patches-4.19/950-0235-staging-bcm2835-camera-Provide-more-specific-probe-e.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.19/950-0235-staging-bcm2835-camera-Provide-more-specific-probe-e.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0235-staging-bcm2835-camera-Provide-more-specific-probe-e.patch b/target/linux/brcm2708/patches-4.19/950-0235-staging-bcm2835-camera-Provide-more-specific-probe-e.patch index e8e3c311ef..c346816db5 100644 --- a/target/linux/brcm2708/patches-4.19/950-0235-staging-bcm2835-camera-Provide-more-specific-probe-e.patch +++ b/target/linux/brcm2708/patches-4.19/950-0235-staging-bcm2835-camera-Provide-more-specific-probe-e.patch @@ -15,7 +15,7 @@ Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c -@@ -1539,8 +1539,11 @@ static int mmal_init(struct bm2835_mmal_ +@@ -1552,8 +1552,11 @@ static int mmal_init(struct bm2835_mmal_ struct vchiq_mmal_component *camera; ret = vchiq_mmal_init(&dev->instance); @@ -28,7 +28,7 @@ Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> /* get the camera component ready */ ret = vchiq_mmal_component_init(dev->instance, "ril.camera", -@@ -1549,7 +1552,9 @@ static int mmal_init(struct bm2835_mmal_ +@@ -1562,7 +1565,9 @@ static int mmal_init(struct bm2835_mmal_ goto unreg_mmal; camera = dev->component[MMAL_COMPONENT_CAMERA]; @@ -39,7 +39,7 @@ Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> ret = -EINVAL; goto unreg_camera; } -@@ -1557,8 +1562,11 @@ static int mmal_init(struct bm2835_mmal_ +@@ -1570,8 +1575,11 @@ static int mmal_init(struct bm2835_mmal_ ret = set_camera_parameters(dev->instance, camera, dev); @@ -52,7 +52,7 @@ Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> /* There was an error in the firmware that meant the camera component * produced BGR instead of RGB. -@@ -1647,8 +1655,8 @@ static int mmal_init(struct bm2835_mmal_ +@@ -1660,8 +1668,8 @@ static int mmal_init(struct bm2835_mmal_ if (dev->component[MMAL_COMPONENT_PREVIEW]->inputs < 1) { ret = -EINVAL; @@ -63,7 +63,7 @@ Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> goto unreg_preview; } -@@ -1661,8 +1669,8 @@ static int mmal_init(struct bm2835_mmal_ +@@ -1674,8 +1682,8 @@ static int mmal_init(struct bm2835_mmal_ if (dev->component[MMAL_COMPONENT_IMAGE_ENCODE]->inputs < 1) { ret = -EINVAL; @@ -74,7 +74,7 @@ Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> 1); goto unreg_image_encoder; } -@@ -1676,8 +1684,8 @@ static int mmal_init(struct bm2835_mmal_ +@@ -1689,8 +1697,8 @@ static int mmal_init(struct bm2835_mmal_ if (dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->inputs < 1) { ret = -EINVAL; @@ -85,7 +85,7 @@ Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> 1); goto unreg_vid_encoder; } -@@ -1706,8 +1714,11 @@ static int mmal_init(struct bm2835_mmal_ +@@ -1719,8 +1727,11 @@ static int mmal_init(struct bm2835_mmal_ sizeof(enable)); } ret = bm2835_mmal_set_all_camera_controls(dev); @@ -98,7 +98,7 @@ Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> return 0; -@@ -1867,21 +1878,29 @@ static int bcm2835_mmal_probe(struct pla +@@ -1880,21 +1891,29 @@ static int bcm2835_mmal_probe(struct pla snprintf(dev->v4l2_dev.name, sizeof(dev->v4l2_dev.name), "%s", BM2835_MMAL_MODULE_NAME); ret = v4l2_device_register(NULL, &dev->v4l2_dev); @@ -132,7 +132,7 @@ Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> /* initialize queue */ q = &dev->capture.vb_vidq; memset(q, 0, sizeof(*q)); -@@ -1899,16 +1918,19 @@ static int bcm2835_mmal_probe(struct pla +@@ -1912,16 +1931,19 @@ static int bcm2835_mmal_probe(struct pla /* initialise video devices */ ret = bm2835_mmal_init_device(dev, &dev->vdev); @@ -155,7 +155,7 @@ Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> goto unreg_dev; } -@@ -1932,8 +1954,6 @@ cleanup_gdev: +@@ -1945,8 +1967,6 @@ cleanup_gdev: bcm2835_cleanup_instance(gdev[i]); gdev[i] = NULL; } |