diff options
| author | Sebastian Reichel <sre@kernel.org> | 2016-08-16 01:17:42 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2016-08-16 01:17:42 +0200 |
| commit | f7c8f1de03eafae8f11818a185cebd82d1043302 (patch) | |
| tree | cde8cfe13c41e252c987a0304716283c53e5e577 /drivers/power/reset | |
| parent | b732ace40a1d5ea643ee9c28116e829ae950fe8f (diff) | |
| parent | 33e7664a0af6e9a516f01014f39737aaa119b6d9 (diff) | |
| download | linux-next-f7c8f1de03eafae8f11818a185cebd82d1043302.tar.gz | |
Merge tag 'for-v4.8-rc' into psy-next
Power Supply Fixes for 4.8 cycle
Diffstat (limited to 'drivers/power/reset')
| -rw-r--r-- | drivers/power/reset/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/power/reset/hisi-reboot.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig index 3bfac539334b..c74c3f67b8da 100644 --- a/drivers/power/reset/Kconfig +++ b/drivers/power/reset/Kconfig @@ -200,8 +200,8 @@ config REBOOT_MODE config SYSCON_REBOOT_MODE tristate "Generic SYSCON regmap reboot mode driver" depends on OF + depends on MFD_SYSCON select REBOOT_MODE - select MFD_SYSCON help Say y here will enable reboot mode driver. This will get reboot mode arguments and store it in SYSCON mapped 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; } |