diff options
| author | Olof Johansson <olof@lixom.net> | 2018-09-25 13:33:02 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-09-25 13:33:02 -0700 |
| commit | d7f59da42c25deafa91a1f2b22ffddfe24be8aa6 (patch) | |
| tree | 5c7d08c08eab7b49a05afdb3d1f54ebb01874e78 /arch/arm | |
| parent | 827f847b631ce23439e7ad2f575e897f43d5de12 (diff) | |
| parent | 34d2a7db77ad837cfb88bd01b33fd1f3855ce9c0 (diff) | |
| download | linux-stable-d7f59da42c25deafa91a1f2b22ffddfe24be8aa6.tar.gz linux-stable-d7f59da42c25deafa91a1f2b22ffddfe24be8aa6.tar.bz2 linux-stable-d7f59da42c25deafa91a1f2b22ffddfe24be8aa6.zip | |
Merge tag 'at91-4.20-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into next/soc
AT91 SoC for 4.20
- rename MAINTAINERS entries and change maintainers
- two pm cleanups
* tag 'at91-4.20-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
MAINTAINERS: sdhci: move the Microchip entry to proper location
MAINTAINERS: move former ATMEL entries to proper MICROCHIP location
MAINTAINERS: remove the / ATMEL string from MICROCHIP entries
MAINTAINERS: iio: add co-maintainer to SAMA5D2-compatible ADC driver
MAINTAINERS: pwm: add entry for Microchip pwm driver
MAINTAINERS: dmaengine: add files to Microchip dma entry
MAINTAINERS: USB: change maintainer for Microchip USBA gadget driver
MAINTAINERS: ASoC: change maintainer for Microchip ALSA drivers
MAINTAINERS: media: change Microchip ISI, ISC maintainers
MAINTAINERS: update entry for Microchip NAND driver support
MAINTAINERS: ARM: at91: add co-maintainer for ARM/Microchip
ARM: at91: pm: call put_device instead of of_node_put in at91_pm_config_ws
ARM: at91: pm: remove pm_bu initialization in at91_pm_backup_init()
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-at91/pm.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 32fae4dbd63b..51e808adb00c 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -143,15 +143,15 @@ static int at91_pm_config_ws(unsigned int pm_mode, bool set) /* Check if enabled on SHDWC. */ if (wsi->shdwc_mr_bit && !(val & wsi->shdwc_mr_bit)) - goto put_node; + goto put_device; mode |= wsi->pmc_fsmr_bit; if (wsi->set_polarity) polarity |= wsi->pmc_fsmr_bit; } -put_node: - of_node_put(np); +put_device: + put_device(&pdev->dev); } if (mode) { @@ -580,8 +580,6 @@ static int __init at91_pm_backup_init(void) if (!at91_is_pm_mode_active(AT91_PM_BACKUP)) return 0; - pm_bu = NULL; - np = of_find_compatible_node(NULL, NULL, "atmel,sama5d2-sfrbu"); if (!np) { pr_warn("%s: failed to find sfrbu!\n", __func__); @@ -590,7 +588,6 @@ static int __init at91_pm_backup_init(void) pm_data.sfrbu = of_iomap(np, 0); of_node_put(np); - pm_bu = NULL; np = of_find_compatible_node(NULL, NULL, "atmel,sama5d2-securam"); if (!np) |