1 files changed, 17 insertions, 2 deletions

diff --git a/arch/x86/platform/intel/iosf_mbi.c b/arch/x86/platform/intel/iosf_mbi.c
index a952ac199741..6f37a2137a79 100644
--- a/arch/x86/platform/intel/iosf_mbi.c
+++ b/arch/x86/platform/intel/iosf_mbi.c
@@ -218,14 +218,23 @@ int iosf_mbi_register_pmic_bus_access_notifier(struct notifier_block *nb)
 }
 EXPORT_SYMBOL(iosf_mbi_register_pmic_bus_access_notifier);
 
+int iosf_mbi_unregister_pmic_bus_access_notifier_unlocked(
+        struct notifier_block *nb)
+{
+        iosf_mbi_assert_punit_acquired();
+
+        return blocking_notifier_chain_unregister(
+                                &iosf_mbi_pmic_bus_access_notifier, nb);
+}
+EXPORT_SYMBOL(iosf_mbi_unregister_pmic_bus_access_notifier_unlocked);
+
 int iosf_mbi_unregister_pmic_bus_access_notifier(struct notifier_block *nb)
 {
         int ret;
 
         /* Wait for the bus to go inactive before unregistering */
         mutex_lock(&iosf_mbi_punit_mutex);
-        ret = blocking_notifier_chain_unregister(
-                                &iosf_mbi_pmic_bus_access_notifier, nb);
+        ret = iosf_mbi_unregister_pmic_bus_access_notifier_unlocked(nb);
         mutex_unlock(&iosf_mbi_punit_mutex);
 
         return ret;
@@ -239,6 +248,12 @@ int iosf_mbi_call_pmic_bus_access_notifier_chain(unsigned long val, void *v)
 }
 EXPORT_SYMBOL(iosf_mbi_call_pmic_bus_access_notifier_chain);
 
+void iosf_mbi_assert_punit_acquired(void)
+{
+        WARN_ON(!mutex_is_locked(&iosf_mbi_punit_mutex));
+}
+EXPORT_SYMBOL(iosf_mbi_assert_punit_acquired);
+
 #ifdef CONFIG_IOSF_MBI_DEBUG
 static u32      dbg_mdr;
 static u32      dbg_mcr;