1 files changed, 11 insertions, 12 deletions

diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index 39086398833e..323ff55cc165 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -449,6 +449,7 @@ static void omap_rtc_power_off(void)
 
         if (tm2bcd(&tm) < 0) {
                 dev_err(&rtc->rtc->dev, "power off failed\n");
+                rtc->type->lock(rtc);
                 return;
         }
 
@@ -582,9 +583,7 @@ static int rtc_pinconf_get(struct pinctrl_dev *pctldev,
         u32 val;
         u16 arg = 0;
 
-        rtc->type->unlock(rtc);
         val = rtc_readl(rtc, OMAP_RTC_PMIC_REG);
-        rtc->type->lock(rtc);
 
         switch (param) {
         case PIN_CONFIG_INPUT_ENABLE:
@@ -614,9 +613,7 @@ static int rtc_pinconf_set(struct pinctrl_dev *pctldev,
         u32 param_val;
         int i;
 
-        rtc->type->unlock(rtc);
         val = rtc_readl(rtc, OMAP_RTC_PMIC_REG);
-        rtc->type->lock(rtc);
 
         /* active low by default */
         val |= OMAP_RTC_PMIC_EXT_WKUP_POL(pin);
@@ -861,13 +858,6 @@ static int omap_rtc_probe(struct platform_device *pdev)
                         goto err;
         }
 
-        if (rtc->is_pmic_controller) {
-                if (!pm_power_off) {
-                        omap_rtc_power_off_rtc = rtc;
-                        pm_power_off = omap_rtc_power_off;
-                }
-        }
-
         /* Support ext_wakeup pinconf */
         rtc_pinctrl_desc.name = dev_name(&pdev->dev);
 
@@ -880,12 +870,21 @@ static int omap_rtc_probe(struct platform_device *pdev)
 
         ret = rtc_register_device(rtc->rtc);
         if (ret)
-                goto err;
+                goto err_deregister_pinctrl;
 
         rtc_nvmem_register(rtc->rtc, &omap_rtc_nvmem_config);
 
+        if (rtc->is_pmic_controller) {
+                if (!pm_power_off) {
+                        omap_rtc_power_off_rtc = rtc;
+                        pm_power_off = omap_rtc_power_off;
+                }
+        }
+
         return 0;
 
+err_deregister_pinctrl:
+        pinctrl_unregister(rtc->pctldev);
 err:
         clk_disable_unprepare(rtc->clk);
         device_init_wakeup(&pdev->dev, false);