提交 a32f2f90 编写于 作者: S Sakari Ailus 提交者: Mauro Carvalho Chehab

[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: NSakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: NLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 1567bb7d
......@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册