summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.com>2019-05-06 10:33:10 +0200
committerPetr Mladek <pmladek@suse.com>2019-05-06 10:33:10 +0200
commit0f46c78391e1348fe45af86a0cd52795726695af (patch)
treeee841bfa1178ce5be421c79bed73bb5e72b6d38e /arch/arm/mach-imx
parentMerge branch 'for-5.2-vsprintf-hardening' into for-linus (diff)
parenttreewide: Switch printk users from %pf and %pF to %ps and %pS, respectively (diff)
downloadlinux-0f46c78391e1348fe45af86a0cd52795726695af.tar.xz
linux-0f46c78391e1348fe45af86a0cd52795726695af.zip
Merge branch 'for-5.2-pf-removal' into for-linus
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/pm-imx6.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c
index 87f45b926c78..e67e0b2d4ce0 100644
--- a/arch/arm/mach-imx/pm-imx6.c
+++ b/arch/arm/mach-imx/pm-imx6.c
@@ -631,7 +631,7 @@ static void imx6_pm_stby_poweroff(void)
static int imx6_pm_stby_poweroff_probe(void)
{
if (pm_power_off) {
- pr_warn("%s: pm_power_off already claimed %p %pf!\n",
+ pr_warn("%s: pm_power_off already claimed %p %ps!\n",
__func__, pm_power_off, pm_power_off);
return -EBUSY;
}