From: Sakari Ailus <sakari.ailus@iki.fi>
Date: Fri, 27 Jan 2012 10:18:51 +0000 (-0300)
Subject: [media] omap3isp: Prevent crash at module unload
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a32f2f90543853449f0e49eaf885e8d24d5809a7;p=openwrt%2Fstaging%2Fblogic.git

[media] omap3isp: Prevent crash at module unload

iommu_domain_free() was called in isp_remove() before omap3isp_put().
omap3isp_put() must not save the context if the IOMMU no longer is there.
Fix this.

Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/omap3isp/isp.c b/drivers/media/video/omap3isp/isp.c
index 3db8583497ee..06afbc14f6ae 100644
--- a/drivers/media/video/omap3isp/isp.c
+++ b/drivers/media/video/omap3isp/isp.c
@@ -1509,7 +1509,8 @@ void omap3isp_put(struct isp_device *isp)
 	BUG_ON(isp->ref_count == 0);
 	if (--isp->ref_count == 0) {
 		isp_disable_interrupts(isp);
-		isp_save_ctx(isp);
+		if (isp->domain)
+			isp_save_ctx(isp);
 		/* Reset the ISP if an entity has failed to stop. This is the
 		 * only way to recover from such conditions.
 		 */
@@ -1996,6 +1997,7 @@ static int isp_remove(struct platform_device *pdev)
 	omap3isp_get(isp);
 	iommu_detach_device(isp->domain, &pdev->dev);
 	iommu_domain_free(isp->domain);
+	isp->domain = NULL;
 	omap3isp_put(isp);
 
 	free_irq(isp->irq_num, isp);