2 files changed, 5 insertions, 3 deletions

diff --git a/arch/arm/boot/dts/sama5d2-pinfunc.h b/arch/arm/boot/dts/sama5d2-pinfunc.h
index 1c01a6f843d8..28a2e45752fe 100644
--- a/arch/arm/boot/dts/sama5d2-pinfunc.h
+++ b/arch/arm/boot/dts/sama5d2-pinfunc.h
@@ -518,7 +518,7 @@
 #define PIN_PC9__GPIO                   PINMUX_PIN(PIN_PC9, 0, 0)
 #define PIN_PC9__FIQ                    PINMUX_PIN(PIN_PC9, 1, 3)
 #define PIN_PC9__GTSUCOMP               PINMUX_PIN(PIN_PC9, 2, 1)
-#define PIN_PC9__ISC_D0                 PINMUX_PIN(PIN_PC9, 2, 1)
+#define PIN_PC9__ISC_D0                 PINMUX_PIN(PIN_PC9, 3, 1)
 #define PIN_PC9__TIOA4                  PINMUX_PIN(PIN_PC9, 4, 2)
 #define PIN_PC10                        74
 #define PIN_PC10__GPIO                  PINMUX_PIN(PIN_PC10, 0, 0)
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 51e808adb00c..2a757dcaa1a5 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -591,13 +591,13 @@ static int __init at91_pm_backup_init(void)
 
         np = of_find_compatible_node(NULL, NULL, "atmel,sama5d2-securam");
         if (!np)
-                goto securam_fail;
+                goto securam_fail_no_ref_dev;
 
         pdev = of_find_device_by_node(np);
         of_node_put(np);
         if (!pdev) {
                 pr_warn("%s: failed to find securam device!\n", __func__);
-                goto securam_fail;
+                goto securam_fail_no_ref_dev;
         }
 
         sram_pool = gen_pool_get(&pdev->dev, NULL);
@@ -620,6 +620,8 @@ static int __init at91_pm_backup_init(void)
         return 0;
 
 securam_fail:
+        put_device(&pdev->dev);
+securam_fail_no_ref_dev:
         iounmap(pm_data.sfrbu);
         pm_data.sfrbu = NULL;
         return ret;