[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 3db8583497ee4b95a4b1a18142e99a8978461421..06afbc14f6ae9792f459d68ece7c38f90ce6f7f0 100644 (file)
--- 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);