diff --git a/drivers/power/qcom-charger/smb-lib.c b/drivers/power/qcom-charger/smb-lib.c
index ebbc8e15f2b8..33824479a84d 100644
--- a/drivers/power/qcom-charger/smb-lib.c
+++ b/drivers/power/qcom-charger/smb-lib.c
@@ -47,10 +47,9 @@ int smblib_read(struct smb_charger *chg, u16 addr, u8 *val)
 
 int smblib_masked_write(struct smb_charger *chg, u16 addr, u8 mask, u8 val)
 {
-	unsigned long flags;
 	int rc = 0;
 
-	spin_lock_irqsave(&chg->write_lock, flags);
+	mutex_lock(&chg->write_lock);
 	if (is_secure(chg, addr)) {
 		rc = regmap_write(chg->regmap, (addr & 0xFF00) | 0xD0, 0xA5);
 		if (rc < 0)
@@ -60,16 +59,15 @@ int smblib_masked_write(struct smb_charger *chg, u16 addr, u8 mask, u8 val)
 	rc = regmap_update_bits(chg->regmap, addr, mask, val);
 
 unlock:
-	spin_unlock_irqrestore(&chg->write_lock, flags);
+	mutex_unlock(&chg->write_lock);
 	return rc;
 }
 
 int smblib_write(struct smb_charger *chg, u16 addr, u8 val)
 {
-	unsigned long flags;
 	int rc = 0;
 
-	spin_lock_irqsave(&chg->write_lock, flags);
+	mutex_lock(&chg->write_lock);
 
 	if (is_secure(chg, addr)) {
 		rc = regmap_write(chg->regmap, (addr & ~(0xFF)) | 0xD0, 0xA5);
@@ -80,7 +78,7 @@ int smblib_write(struct smb_charger *chg, u16 addr, u8 val)
 	rc = regmap_write(chg->regmap, addr, val);
 
 unlock:
-	spin_unlock_irqrestore(&chg->write_lock, flags);
+	mutex_unlock(&chg->write_lock);
 	return rc;
 }
 
@@ -1281,7 +1279,7 @@ int smblib_init(struct smb_charger *chg)
 {
 	int rc = 0;
 
-	spin_lock_init(&chg->write_lock);
+	mutex_init(&chg->write_lock);
 	INIT_DELAYED_WORK(&chg->hvdcp_detect_work, smblib_hvdcp_detect_work);
 
 	chg->usb_suspend_votable = create_votable(chg->dev,
diff --git a/drivers/power/qcom-charger/smb-lib.h b/drivers/power/qcom-charger/smb-lib.h
index 6b1037bf4ee7..b688b5ebf0af 100644
--- a/drivers/power/qcom-charger/smb-lib.h
+++ b/drivers/power/qcom-charger/smb-lib.h
@@ -62,7 +62,7 @@ struct smb_charger {
 	int			*debug_mask;
 
 	/* locks */
-	spinlock_t		write_lock;
+	struct mutex		write_lock;
 	struct mutex		ps_change_lock;
 
 	/* power supplies */