diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2022-05-16 23:40:32 +0200 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2022-05-17 15:11:22 +0200 |
| commit | 20ea6adbf199097c4f5f591ffee088340630dae4 (patch) | |
| tree | d6719d95e136611a1c25bbf7789652d6d402779d /target/linux/bcm27xx/patches-5.15/950-0616-staging-bcm2835-isp-Fix-cleanup-after-init-fail.patch | |
| parent | bca05bd072180dc38ef740b37ded9572a6db1981 (diff) | |
| download | upstream-20ea6adbf199097c4f5f591ffee088340630dae4.tar.gz upstream-20ea6adbf199097c4f5f591ffee088340630dae4.tar.bz2 upstream-20ea6adbf199097c4f5f591ffee088340630dae4.zip | |
bcm27xx: add support for linux v5.15
Build system: x86_64
Build-tested: bcm2708, bcm2709, bcm2710, bcm2711
Run-tested: bcm2708/RPiB+, bcm2709/RPi3B, bcm2710/RPi3B, bcm2711/RPi4B
Signed-off-by: Marty Jones <mj8263788@gmail.com>
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.15/950-0616-staging-bcm2835-isp-Fix-cleanup-after-init-fail.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.15/950-0616-staging-bcm2835-isp-Fix-cleanup-after-init-fail.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.15/950-0616-staging-bcm2835-isp-Fix-cleanup-after-init-fail.patch b/target/linux/bcm27xx/patches-5.15/950-0616-staging-bcm2835-isp-Fix-cleanup-after-init-fail.patch new file mode 100644 index 0000000000..a2630f3d58 --- /dev/null +++ b/target/linux/bcm27xx/patches-5.15/950-0616-staging-bcm2835-isp-Fix-cleanup-after-init-fail.patch @@ -0,0 +1,38 @@ +From f5b1e0398dc2f3b80c62c06ad7bb39224cd07bf8 Mon Sep 17 00:00:00 2001 +From: Phil Elwell <phil@raspberrypi.com> +Date: Thu, 16 Dec 2021 16:25:00 +0000 +Subject: [PATCH] staging/bcm2835-isp: Fix cleanup after init fail + +bcm2835_isp_remove is called on an initialisation failure, but at that +point the drvdata hasn't been set. This causes a crash when e.g. using +the cutdown firmware (gpu_mem=16). + +Move platform_set_drvdata before the instance probing loop to avoid the +problem. + +See: https://github.com/raspberrypi/linux/issues/4774 + +Signed-off-by: Phil Elwell <phil@raspberrypi.com> +--- + drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c ++++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c +@@ -1774,6 +1774,8 @@ static int bcm2835_isp_probe(struct plat + if (!bcm2835_isp_instances) + return -ENOMEM; + ++ platform_set_drvdata(pdev, bcm2835_isp_instances); ++ + for (i = 0; i < BCM2835_ISP_NUM_INSTANCES; i++) { + ret = bcm2835_isp_probe_instance(pdev, + &bcm2835_isp_instances[i], i); +@@ -1781,7 +1783,6 @@ static int bcm2835_isp_probe(struct plat + goto error; + } + +- platform_set_drvdata(pdev, bcm2835_isp_instances); + dev_info(&pdev->dev, "Loaded V4L2 %s\n", BCM2835_ISP_NAME); + return 0; + |