From: Greg Kroah-Hartman Date: Tue, 16 Nov 2021 14:06:47 +0000 (+0100) Subject: drop media-i2c-ths8200-needs-v4l2_async.patch from 5.4 and 5.10 X-Git-Tag: v5.4.160~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=19dfca6700b202d96b03f543625dc26b300a1a5a;p=thirdparty%2Fkernel%2Fstable-queue.git drop media-i2c-ths8200-needs-v4l2_async.patch from 5.4 and 5.10 --- diff --git a/queue-5.10/media-i2c-ths8200-needs-v4l2_async.patch b/queue-5.10/media-i2c-ths8200-needs-v4l2_async.patch deleted file mode 100644 index 5256b99667a..00000000000 --- a/queue-5.10/media-i2c-ths8200-needs-v4l2_async.patch +++ /dev/null @@ -1,44 +0,0 @@ -From a61f99205e6074bdbbdb6e77d31b25836666ab75 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 5 Sep 2021 01:28:08 +0200 -Subject: media: i2c: ths8200 needs V4L2_ASYNC - -From: Randy Dunlap - -[ Upstream commit e4625044d656f3c33ece0cc9da22577bc10ca5d3 ] - -Fix the build errors reported by the kernel test robot by -selecting V4L2_ASYNC: - -mips-linux-ld: drivers/media/i2c/ths8200.o: in function `ths8200_remove': -ths8200.c:(.text+0x1ec): undefined reference to `v4l2_async_unregister_subdev' -mips-linux-ld: drivers/media/i2c/ths8200.o: in function `ths8200_probe': -ths8200.c:(.text+0x404): undefined reference to `v4l2_async_register_subdev' - -Fixes: ed29f89497006 ("media: i2c: ths8200: support asynchronous probing") -Signed-off-by: Randy Dunlap -Reported-by: kernel test robot -Reviewed-by: Lad Prabhakar -Acked-by: Sakari Ailus -Signed-off-by: Hans Verkuil -Signed-off-by: Mauro Carvalho Chehab -Signed-off-by: Sasha Levin ---- - drivers/media/i2c/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig -index 878f66ef2719f..5f5a3915ac778 100644 ---- a/drivers/media/i2c/Kconfig -+++ b/drivers/media/i2c/Kconfig -@@ -595,6 +595,7 @@ config VIDEO_AK881X - config VIDEO_THS8200 - tristate "Texas Instruments THS8200 video encoder" - depends on VIDEO_V4L2 && I2C -+ select V4L2_ASYNC - help - Support for the Texas Instruments THS8200 video encoder. - --- -2.33.0 - diff --git a/queue-5.10/series b/queue-5.10/series index 59cc206180b..c166c66fc51 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -289,7 +289,6 @@ media-dvb-usb-fix-ununit-value-in-az6027_rc_query.patch media-v4l2-ioctl-s_ctrl-output-the-right-value.patch media-tda1997x-handle-short-reads-of-hdmi-info-frame.patch media-mtk-vpu-fix-a-resource-leak-in-the-error-handl.patch -media-i2c-ths8200-needs-v4l2_async.patch media-radio-wl1273-avoid-card-name-truncation.patch media-si470x-avoid-card-name-truncation.patch media-tm6000-avoid-card-name-truncation.patch diff --git a/queue-5.4/media-i2c-ths8200-needs-v4l2_async.patch b/queue-5.4/media-i2c-ths8200-needs-v4l2_async.patch deleted file mode 100644 index 89f4cd2b773..00000000000 --- a/queue-5.4/media-i2c-ths8200-needs-v4l2_async.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 3189af0b190d5792ffc42fcccb4d1108eb199ceb Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 5 Sep 2021 01:28:08 +0200 -Subject: media: i2c: ths8200 needs V4L2_ASYNC - -From: Randy Dunlap - -[ Upstream commit e4625044d656f3c33ece0cc9da22577bc10ca5d3 ] - -Fix the build errors reported by the kernel test robot by -selecting V4L2_ASYNC: - -mips-linux-ld: drivers/media/i2c/ths8200.o: in function `ths8200_remove': -ths8200.c:(.text+0x1ec): undefined reference to `v4l2_async_unregister_subdev' -mips-linux-ld: drivers/media/i2c/ths8200.o: in function `ths8200_probe': -ths8200.c:(.text+0x404): undefined reference to `v4l2_async_register_subdev' - -Fixes: ed29f89497006 ("media: i2c: ths8200: support asynchronous probing") -Signed-off-by: Randy Dunlap -Reported-by: kernel test robot -Reviewed-by: Lad Prabhakar -Acked-by: Sakari Ailus -Signed-off-by: Hans Verkuil -Signed-off-by: Mauro Carvalho Chehab -Signed-off-by: Sasha Levin ---- - drivers/media/i2c/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig -index fcffcc31d168a..aa2c3776db840 100644 ---- a/drivers/media/i2c/Kconfig -+++ b/drivers/media/i2c/Kconfig -@@ -552,6 +552,7 @@ config VIDEO_AK881X - config VIDEO_THS8200 - tristate "Texas Instruments THS8200 video encoder" - depends on VIDEO_V4L2 && I2C -+ select V4L2_ASYNC - help - Support for the Texas Instruments THS8200 video encoder. - --- -2.33.0 - diff --git a/queue-5.4/series b/queue-5.4/series index 0d647cf04bb..307a7f77db1 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -195,7 +195,6 @@ media-cxd2880-spi-fix-a-null-pointer-dereference-on-.patch media-dvb-usb-fix-ununit-value-in-az6027_rc_query.patch media-tda1997x-handle-short-reads-of-hdmi-info-frame.patch media-mtk-vpu-fix-a-resource-leak-in-the-error-handl.patch -media-i2c-ths8200-needs-v4l2_async.patch media-radio-wl1273-avoid-card-name-truncation.patch media-si470x-avoid-card-name-truncation.patch media-tm6000-avoid-card-name-truncation.patch