mtd: omap2: fix module loading

Andreas Bießmann · gregkh · commit ccf5af221ef1 · 2012-10-13T05:50:34.000+09:00
commit 4d3d688 upstream. Unloading the omap2 nand driver missed to release the memory region which will result in not being able to request it again if one want to load the driver later on. This patch fixes following error when loading omap2 module after unloading: ---8<--- ~ $ rmmod omap2 ~ $ modprobe omap2 [ 37.420928] omap2-nand: probe of omap2-nand.0 failed with error -16 ~ $ --->8--- This error was introduced in 67ce04b which was the first commit of this driver. Signed-off-by: Andreas Bießmann <andreas@biessmann.de> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
@@ -1387,6 +1387,7 @@ static int omap_nand_remove(struct platform_device *pdev)
 	/* Release NAND device, its internal structures and partitions */
 	nand_release(&info->mtd);
 	iounmap(info->nand.IO_ADDR_R);
+	release_mem_region(info->phys_base, NAND_IO_SIZE);
 	kfree(info);
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -1387,6 +1387,7 @@ static int omap_nand_remove(struct platform_device *pdev)`
`1387`	`1387`	`/* Release NAND device, its internal structures and partitions */`
`1388`	`1388`	`nand_release(&info->mtd);`
`1389`	`1389`	`iounmap(info->nand.IO_ADDR_R);`
	`1390`	`+ release_mem_region(info->phys_base, NAND_IO_SIZE);`
`1390`	`1391`	`kfree(info);`
`1391`	`1392`	`return 0;`
`1392`	`1393`	`}`