Skip to content

Commit

Permalink
[media] omap3isp: Prevent crash at module unload
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sakari Ailus authored and Mauro Carvalho Chehab committed May 8, 2012
1 parent 1567bb7 commit a32f2f9
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/media/video/omap3isp/isp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit a32f2f9

Please sign in to comment.