drop queue-4.19/media-staging-media-release-the-correct-resource-in-.patch

diff --git a/queue-4.19/media-staging-media-release-the-correct-resource-in-.patch b/queue-4.19/media-staging-media-release-the-correct-resource-in-.patch
deleted file mode 100644 (file)
index b744271..0000000
--- a/queue-4.19/media-staging-media-release-the-correct-resource-in-.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 383554093f567b3e07087aa37d6ea565af499acd Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 20 Aug 2017 12:49:01 -0400
-Subject: media: Staging: media: Release the correct resource in an error
- handling path
-
-From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
-
-[ Upstream commit 3b6471c7becd06325eb5e701cc2602b2edbbc7b6 ]
-
-'res' is reassigned several times in the function and if we 'goto
-error_unmap', its value is not the returned value of 'request_mem_region()'
-anymore.
-
-Introduce a new 'struct resource *' variable (i.e. res2) to keep a pointer
-to the right resource, if needed in the error handling path.
-
-Fixes: 4b4eda001704 ("Staging: media: Unmap and release region obtained by ioremap_nocache")
-
-Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
-Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/staging/media/davinci_vpfe/dm365_ipipe.c b/drivers/staging/media/davinci_vpfe/dm365_ipipe.c
-index 95942768639cd..7bf2648affc0c 100644
---- a/drivers/staging/media/davinci_vpfe/dm365_ipipe.c
-+++ b/drivers/staging/media/davinci_vpfe/dm365_ipipe.c
-@@ -1777,7 +1777,7 @@ vpfe_ipipe_init(struct vpfe_ipipe_device *ipipe, struct platform_device *pdev)
-       struct media_pad *pads = &ipipe->pads[0];
-       struct v4l2_subdev *sd = &ipipe->subdev;
-       struct media_entity *me = &sd->entity;
--      struct resource *res, *memres;
-+      struct resource *res, *res2, *memres;
- 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 4);
-       if (!res)
-@@ -1791,11 +1791,11 @@ vpfe_ipipe_init(struct vpfe_ipipe_device *ipipe, struct platform_device *pdev)
-       if (!ipipe->base_addr)
-               goto error_release;
- 
--      res = platform_get_resource(pdev, IORESOURCE_MEM, 6);
--      if (!res)
-+      res2 = platform_get_resource(pdev, IORESOURCE_MEM, 6);
-+      if (!res2)
-               goto error_unmap;
--      ipipe->isp5_base_addr = ioremap_nocache(res->start,
--                                              resource_size(res));
-+      ipipe->isp5_base_addr = ioremap_nocache(res2->start,
-+                                              resource_size(res2));
-       if (!ipipe->isp5_base_addr)
-               goto error_unmap;
- 
--- 
-2.20.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index c97e1c04665656ff14b2e489b2312e9068993f7a..5686cafc1b8c226b79127fb1b59ff4ab4cf29b12 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -398,7 +398,6 @@ signal-bpfilter-fix-bpfilter_kernl-to-use-send_sig-n.patch
 signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch
 inet-frags-call-inet_frags_fini-after-unregister_per.patch
 net-hns3-fix-a-memory-leak-issue-for-hclge_map_unmap.patch
-media-staging-media-release-the-correct-resource-in-.patch
 crypto-talitos-fix-aead-processing.patch
 netvsc-unshare-skb-in-vf-rx-handler.patch
 net-core-support-xdp-generic-on-stacked-devices.patch