summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArvind Yadav <arvind.yadav.cs@gmail.com>2016-08-12 20:49:18 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-30 10:12:45 +0200
commitc11aadb9babfba7401de5af8d34391a72e36cee3 (patch)
tree6c3ea1f4eafb40cc60d4858f53abd52fae810b81
parent1c79cde5f08004f1d9881e36580f4cbf37b095d5 (diff)
downloadlinux-stable-c11aadb9babfba7401de5af8d34391a72e36cee3.tar.gz
linux-stable-c11aadb9babfba7401de5af8d34391a72e36cee3.tar.bz2
linux-stable-c11aadb9babfba7401de5af8d34391a72e36cee3.zip
power: reset: hisi-reboot: Unmap region obtained by of_iomap
commit bae170efd6c42bf116f513a1dd07639d68fa71b9 upstream. Free memory mapping, if probe is not successful. Fixes: 4a9b37371822 ("power: reset: move hisilicon reboot code") Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com> Signed-off-by: Sebastian Reichel <sre@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/power/reset/hisi-reboot.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/power/reset/hisi-reboot.c b/drivers/power/reset/hisi-reboot.c
index 9ab7f562a83b..f69387e12c1e 100644
--- a/drivers/power/reset/hisi-reboot.c
+++ b/drivers/power/reset/hisi-reboot.c
@@ -53,13 +53,16 @@ static int hisi_reboot_probe(struct platform_device *pdev)
if (of_property_read_u32(np, "reboot-offset", &reboot_offset) < 0) {
pr_err("failed to find reboot-offset property\n");
+ iounmap(base);
return -EINVAL;
}
err = register_restart_handler(&hisi_restart_nb);
- if (err)
+ if (err) {
dev_err(&pdev->dev, "cannot register restart handler (err=%d)\n",
err);
+ iounmap(base);
+ }
return err;
}