releases/4.19.9/media-omap3isp-unregister-media-device-as-first.patch

   1 From 0f2061a6e1ded5fc73d9b23afcd9da5001857d31 Mon Sep 17 00:00:00 2001
   2 From: Sakari Ailus <sakari.ailus@linux.intel.com>
   3 Date: Tue, 9 Oct 2018 07:49:49 -0400
   4 Subject: media: omap3isp: Unregister media device as first
   5
   6 [ Upstream commit 30efae3d789cd0714ef795545a46749236e29558 ]
   7
   8 While there are issues related to object lifetime management, unregister the
   9 media device first when the driver is being unbound. This is slightly
  10 safer.
  11
  12 Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
  13 Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  14 Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
  15 Signed-off-by: Sasha Levin <sashal@kernel.org>
  16 ---
  17  drivers/media/platform/omap3isp/isp.c | 3 ++-
  18  1 file changed, 2 insertions(+), 1 deletion(-)
  19
  20 diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
  21 index 842e2235047d..432bc7fbedc9 100644
  22 --- a/drivers/media/platform/omap3isp/isp.c
  23 +++ b/drivers/media/platform/omap3isp/isp.c
  24 @@ -1587,6 +1587,8 @@ static void isp_pm_complete(struct device *dev)
  25
  26  static void isp_unregister_entities(struct isp_device *isp)
  27  {
  28 +       media_device_unregister(&isp->media_dev);
  29 +
  30         omap3isp_csi2_unregister_entities(&isp->isp_csi2a);
  31         omap3isp_ccp2_unregister_entities(&isp->isp_ccp2);
  32         omap3isp_ccdc_unregister_entities(&isp->isp_ccdc);
  33 @@ -1597,7 +1599,6 @@ static void isp_unregister_entities(struct isp_device *isp)
  34         omap3isp_stat_unregister_entities(&isp->isp_hist);
  35
  36         v4l2_device_unregister(&isp->v4l2_dev);
  37 -       media_device_unregister(&isp->media_dev);
  38         media_device_cleanup(&isp->media_dev);
  39  }
  40
  41 --
  42 2.19.1
  43