aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.4/950-0694-staging-vc04_services-isp-Remove-duplicated-initiali.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0694-staging-vc04_services-isp-Remove-duplicated-initiali.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.4/950-0694-staging-vc04_services-isp-Remove-duplicated-initiali.patch62
1 files changed, 0 insertions, 62 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0694-staging-vc04_services-isp-Remove-duplicated-initiali.patch b/target/linux/bcm27xx/patches-5.4/950-0694-staging-vc04_services-isp-Remove-duplicated-initiali.patch
deleted file mode 100644
index d2b0bf1f2f..0000000000
--- a/target/linux/bcm27xx/patches-5.4/950-0694-staging-vc04_services-isp-Remove-duplicated-initiali.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 6a9cc90467f4b14d596a819c87d48764a4ba5282 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 1 May 2020 17:49:08 +0100
-Subject: [PATCH] staging: vc04_services: isp: Remove duplicated
- initialisation
-
-With the codec code from which this was derived, the driver had to
-get the supported formats for both input and output ports.
-This had been copied across, however here we have independent nodes
-for each port, but the code had been left in to do the same thing
-twice.
-Remove the duplicate.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../bcm2835-isp/bcm2835-v4l2-isp.c | 35 -------------------
- 1 file changed, 35 deletions(-)
-
---- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-@@ -1160,41 +1160,6 @@ static int bcm2835_isp_get_supported_fmt
- }
- node->supported_fmts.num_entries = j;
-
-- param_size = sizeof(fourccs);
-- ret = vchiq_mmal_port_parameter_get(dev->mmal_instance,
-- get_port_data(node),
-- MMAL_PARAMETER_SUPPORTED_ENCODINGS,
-- &fourccs, &param_size);
--
-- if (ret) {
-- if (ret == MMAL_MSG_STATUS_ENOSPC) {
-- v4l2_err(&dev->v4l2_dev,
-- "%s: port has more encoding than we provided space for. Some are dropped.\n",
-- __func__);
-- num_encodings = MAX_SUPPORTED_ENCODINGS;
-- } else {
-- return -EINVAL;
-- }
-- } else {
-- num_encodings = param_size / sizeof(u32);
-- }
-- /* Assume at this stage that all encodings will be supported in V4L2. */
-- list = devm_kzalloc(dev->dev,
-- sizeof(struct bcm2835_isp_fmt) * num_encodings,
-- GFP_KERNEL);
-- if (!list)
-- return -ENOMEM;
-- node->supported_fmts.list = list;
--
-- for (i = 0, j = 0; i < num_encodings; i++) {
-- const struct bcm2835_isp_fmt *fmt = get_fmt(fourccs[i]);
--
-- if (fmt) {
-- list[j] = *fmt;
-- j++;
-- }
-- }
-- node->supported_fmts.num_entries = j;
- return 0;
- }
-