---

yaml --- r: 306248 b: refs/heads/master c: a32f2f9 h: refs/heads/master v: v3
git-mirror · May 8, 2012 · 6bcdfcd · 6bcdfcd
1 parent 663eebc
commit 6bcdfcd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1567bb7dcc6a232693143fdbe3b89791f20890ac
+refs/heads/master: a32f2f90543853449f0e49eaf885e8d24d5809a7
diff --git a/trunk/drivers/media/video/omap3isp/isp.c b/trunk/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);