mtd: maps: add missing iounmap() in error path

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=3502fbcc25eb67db96fea35abe721c82aa1f4ff3
Commit:     3502fbcc25eb67db96fea35abe721c82aa1f4ff3
Parent:     5fed67df878b598c3a4afdd4c09e9bea491651dd
Author:     Luis Henriques <henrix at camandro.org>
AuthorDate: Wed Nov 23 23:40:36 2016 +0000
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Wed Nov 30 18:30:24 2016 -0800

    mtd: maps: add missing iounmap() in error path
    
    This patch was triggered by the following Coccinelle error:
    
    ./drivers/mtd/maps/sc520cdp.c:246:3-9: \
    	ERROR: missing iounmap; ioremap on line 242 \
    	and execution via conditional on line 244
    
    Since do_map_probe() is also invoked in this loop, it is also necessary to
    map_destroy() any initialised struct mtd_info.
    
    Signed-off-by: Luis Henriques <henrix at camandro.org>
    Reviewed-by: Marek Vasut <marek.vasut at gmail.com>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/maps/sc520cdp.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/mtd/maps/sc520cdp.c b/drivers/mtd/maps/sc520cdp.c
index 093edd5..9b1c13aa 100644
--- a/drivers/mtd/maps/sc520cdp.c
+++ b/drivers/mtd/maps/sc520cdp.c
@@ -227,7 +227,7 @@ static void sc520cdp_setup_par(void)
 
 static int __init init_sc520cdp(void)
 {
-	int i, devices_found = 0;
+	int i, j, devices_found = 0;
 
 #ifdef REPROGRAM_PAR
 	/* reprogram PAR registers so flash appears at the desired addresses */
@@ -243,6 +243,12 @@ static int __init init_sc520cdp(void)
 
 		if (!sc520cdp_map[i].virt) {
 			printk("Failed to ioremap_nocache\n");
+			for (j = 0; j < i; j++) {
+				if (mymtd[j]) {
+					map_destroy(mymtd[j]);
+					iounmap(sc520cdp_map[j].virt);
+				}
+			}
 			return -EIO;
 		}