From: Greg Kroah-Hartman Date: Mon, 13 Oct 2025 08:42:52 +0000 (+0200) Subject: drop queue-6.1/media-zoran-remove-zoran_fh-structure.patch X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e93954b32a5e4a01fe1d01eca24b0effeedeb4f0;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-6.1/media-zoran-remove-zoran_fh-structure.patch Broke the build --- diff --git a/queue-6.1/media-zoran-remove-zoran_fh-structure.patch b/queue-6.1/media-zoran-remove-zoran_fh-structure.patch deleted file mode 100644 index 34dbf5c3b9..0000000000 --- a/queue-6.1/media-zoran-remove-zoran_fh-structure.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 3a5b287fa79b05863f5c02895f1e9f9537a62a02 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 10 Aug 2025 04:30:15 +0300 -Subject: media: zoran: Remove zoran_fh structure - -From: Jacopo Mondi - -[ Upstream commit dc322d13cf417552b59e313e809a6da40b8b36ef ] - -The zoran_fh structure is a wrapper around v4l2_fh. Its usage has been -mostly removed by commit 83f89a8bcbc3 ("media: zoran: convert to vb2"), -but the structure stayed by mistake. It is now used in a single -location, assigned from a void pointer and then recast to a void -pointer, without being every accessed. Drop it. - -Fixes: 83f89a8bcbc3 ("media: zoran: convert to vb2") -Signed-off-by: Jacopo Mondi -Signed-off-by: Laurent Pinchart -Signed-off-by: Hans Verkuil -Signed-off-by: Sasha Levin ---- - drivers/media/pci/zoran/zoran.h | 6 ------ - drivers/media/pci/zoran/zoran_driver.c | 3 +-- - 2 files changed, 1 insertion(+), 8 deletions(-) - -diff --git a/drivers/media/pci/zoran/zoran.h b/drivers/media/pci/zoran/zoran.h -index 56340553b2823..63592c4f9ed8c 100644 ---- a/drivers/media/pci/zoran/zoran.h -+++ b/drivers/media/pci/zoran/zoran.h -@@ -154,12 +154,6 @@ struct zoran_jpg_settings { - - struct zoran; - --/* zoran_fh contains per-open() settings */ --struct zoran_fh { -- struct v4l2_fh fh; -- struct zoran *zr; --}; -- - struct card_info { - enum card_type type; - char name[32]; -diff --git a/drivers/media/pci/zoran/zoran_driver.c b/drivers/media/pci/zoran/zoran_driver.c -index fa672cc8bc678..feb39854a989e 100644 ---- a/drivers/media/pci/zoran/zoran_driver.c -+++ b/drivers/media/pci/zoran/zoran_driver.c -@@ -511,12 +511,11 @@ static int zoran_s_fmt_vid_cap(struct file *file, void *__fh, - struct v4l2_format *fmt) - { - struct zoran *zr = video_drvdata(file); -- struct zoran_fh *fh = __fh; - int i; - int res = 0; - - if (fmt->fmt.pix.pixelformat == V4L2_PIX_FMT_MJPEG) -- return zoran_s_fmt_vid_out(file, fh, fmt); -+ return zoran_s_fmt_vid_out(file, __fh, fmt); - - for (i = 0; i < NUM_FORMATS; i++) - if (fmt->fmt.pix.pixelformat == zoran_formats[i].fourcc) --- -2.51.0 - diff --git a/queue-6.1/series b/queue-6.1/series index e7716df861..dc0fcf45d2 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -89,7 +89,6 @@ i2c-designware-add-disabling-clocks-when-probe-fails.patch bpf-enforce-expected_attach_type-for-tailcall-compat.patch drm-panel-novatek-nt35560-fix-invalid-return-value.patch drm-radeon-r600_cs-clean-up-of-dead-code-in-r600_cs.patch -media-zoran-remove-zoran_fh-structure.patch usb-host-max3421-hcd-fix-error-pointer-dereference-i.patch serial-max310x-add-error-checking-in-probe.patch drm-amd-display-remove-redundant-semicolons.patch