diff --git a/[refs] b/[refs]
index 4c158ddd244b..3b29e4408d01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 271b874ba1512a1b3bd24edbd4e4116c3b5c15ae
+refs/heads/master: cb54751d7a706b4a068b798b97e8a815b99fa835
diff --git a/trunk/drivers/mtd/nand/sh_flctl.c b/trunk/drivers/mtd/nand/sh_flctl.c
index aa9b8a5e0b8f..a5a60cac7e70 100644
--- a/trunk/drivers/mtd/nand/sh_flctl.c
+++ b/trunk/drivers/mtd/nand/sh_flctl.c
@@ -918,6 +918,7 @@ static int __devinit flctl_probe(struct platform_device *pdev)
 
 err_chip:
 	pm_runtime_disable(&pdev->dev);
+	iounmap(flctl->reg);
 err_iomap:
 	kfree(flctl);
 	return ret;
@@ -929,6 +930,7 @@ static int __devexit flctl_remove(struct platform_device *pdev)
 
 	nand_release(&flctl->mtd);
 	pm_runtime_disable(&pdev->dev);
+	iounmap(flctl->reg);
 	kfree(flctl);
 
 	return 0;