patch-2.4.2 linux/drivers/mtd/vmax301.c

Next file: linux/drivers/net/3c501.c
Previous file: linux/drivers/mtd/slram.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.1/linux/drivers/mtd/vmax301.c linux/drivers/mtd/vmax301.c
@@ -17,7 +17,7 @@
    ##################################################################### */
 
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <asm/spinlock.h>
@@ -228,8 +228,10 @@
 		}
 	}
 
-	if (!vmax_mtd[1] && !vmax_mtd[2])
+	if (!vmax_mtd[1] && !vmax_mtd[2]) {
+		iounmap(iomapadr);
 		return -ENXIO;
+	}
 
 	return 0;
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)