diff options
| author | Tony Lindgren <tony@atomide.com> | 2021-01-15 12:48:43 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2021-01-15 12:48:43 +0200 |
| commit | 715a1284d89a740b197b3bad5eb20d36a397382f (patch) | |
| tree | 07ad2960ab66e56b3d1e151036262019a18e3df1 /drivers/media/platform/davinci/isif.c | |
| parent | 181739822cf6f8f4e12b173913af2967a28906c0 (diff) | |
| parent | 06862d789ddde8a99c1e579e934ca17c15a84755 (diff) | |
Merge branch 'cpuidle-fix' into fixes
Diffstat (limited to 'drivers/media/platform/davinci/isif.c')
| -rw-r--r-- | drivers/media/platform/davinci/isif.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/media/platform/davinci/isif.c b/drivers/media/platform/davinci/isif.c index c98edb67cfb2..c53cecd072b1 100644 --- a/drivers/media/platform/davinci/isif.c +++ b/drivers/media/platform/davinci/isif.c @@ -1075,10 +1075,14 @@ fail_base_iomap: release_mem_region(res->start, resource_size(res)); i--; fail_nobase_res: - if (isif_cfg.base_addr) + if (isif_cfg.base_addr) { iounmap(isif_cfg.base_addr); - if (isif_cfg.linear_tbl0_addr) + isif_cfg.base_addr = NULL; + } + if (isif_cfg.linear_tbl0_addr) { iounmap(isif_cfg.linear_tbl0_addr); + isif_cfg.linear_tbl0_addr = NULL; + } while (i >= 0) { res = platform_get_resource(pdev, IORESOURCE_MEM, i); @@ -1096,8 +1100,11 @@ static int isif_remove(struct platform_device *pdev) int i = 0; iounmap(isif_cfg.base_addr); + isif_cfg.base_addr = NULL; iounmap(isif_cfg.linear_tbl0_addr); + isif_cfg.linear_tbl0_addr = NULL; iounmap(isif_cfg.linear_tbl1_addr); + isif_cfg.linear_tbl1_addr = NULL; while (i < 3) { res = platform_get_resource(pdev, IORESOURCE_MEM, i); if (res) |