Skip to contentSkip to conversation

Patch "power: reset: hisi-reboot: Unmap region obtained by of_iomap" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Sep 27, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

power: reset: hisi-reboot: Unmap region obtained by of_iomap

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
power-reset-hisi-reboot-unmap-region-obtained-by-of_iomap.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From bae170efd6c42bf116f513a1dd07639d68fa71b9 Mon Sep 17 00:00:00 2001

From: Arvind Yadav <[email protected]>
Date: Fri, 12 Aug 2016 20:49:18 +0530
Subject: power: reset: hisi-reboot: Unmap region obtained by of_iomap

From: Arvind Yadav <[email protected]>

commit bae170efd6c42bf116f513a1dd07639d68fa71b9 upstream.

Free memory mapping, if probe is not successful.

Fixes 4a9b37371822 ("power: reset: move hisilicon reboot code")
---
 drivers/power/reset/hisi-reboot.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/power/reset/hisi-reboot.c +4 -1
@@ -53,13 +53,16 @@ static int hisi_reboot_probe(struct plat
 
 	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;
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/power-reset-hisi-reboot-unmap-region-obtained-by-of_iomap.patch