diff options
| author | Sakari Ailus <sakari.ailus@iki.fi> | 2012-01-27 07:18:51 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-08 13:50:51 -0300 |
| commit | a32f2f90543853449f0e49eaf885e8d24d5809a7 (patch) | |
| tree | f4d2cef9bc4575918be7d2be24e3a8ba9a3e4de8 /drivers/media/video/omap3isp/isp.c | |
| parent | 1567bb7dcc6a232693143fdbe3b89791f20890ac (diff) | |
| download | op-kernel-dev-a32f2f90543853449f0e49eaf885e8d24d5809a7.zip op-kernel-dev-a32f2f90543853449f0e49eaf885e8d24d5809a7.tar.gz | |
[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>
Diffstat (limited to 'drivers/media/video/omap3isp/isp.c')
| -rw-r--r-- | drivers/media/video/omap3isp/isp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/omap3isp/isp.c b/drivers/media/video/omap3isp/isp.c index 3db8583..06afbc1 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); |
