diff --git a/drivers/mfd/max77851.c b/drivers/mfd/max77851.c
index 05328ae5..95d19fe9 100644
--- a/drivers/mfd/max77851.c
+++ b/drivers/mfd/max77851.c
@@ -229,7 +229,11 @@ static int max77851_config_fps(struct max77851_chip *chip,
 	fps_max_period = MAX77851_FPS_PERIOD_MAX_US;
 
 	for (fps_id = 0; fps_id < MX_FPS_MASTER_NUM; fps_id++) {
-		sprintf(fps_name, "fps%d", fps_id);
+		ret = sprintf(fps_name, "fps%d", fps_id);
+		if (ret < 0) {
+			dev_err(dev, "sprintf failed with error status: 0x%x\n", ret);
+			return -EINVAL;
+		}
 		if (!strcmp(fps_np->name, fps_name))
 			break;
 	}
diff --git a/drivers/pinctrl/pinctrl-max77851.c b/drivers/pinctrl/pinctrl-max77851.c
index e692b86d..7d317c5a 100644
--- a/drivers/pinctrl/pinctrl-max77851.c
+++ b/drivers/pinctrl/pinctrl-max77851.c
@@ -627,15 +627,14 @@ static int max77851_pinconf_set(struct pinctrl_dev *pctldev,
 			if (IS_GPIO(pin) || IS_NRSTIO(pin)) {
 				mask = GPIO_CFG0_SUP;
 				shift = FFS(GPIO_CFG0_SUP);
-			}
+				val = param_val;
+				reg_addr = pcntl->pin_groups[pin].pin_cfg0_addr;
 
-			val = param_val;
-			reg_addr = pcntl->pin_groups[pin].pin_cfg0_addr;
-
-			ret = regmap_update_bits(pcntl->rmap, reg_addr, mask, val << shift);
-			if (ret < 0) {
-				dev_err(dev, "Input Supply GPIO update failed: %d\n", ret);
-				return ret;
+				ret = regmap_update_bits(pcntl->rmap, reg_addr, mask, val << shift);
+				if (ret < 0) {
+					dev_err(dev, "Input Supply GPIO update failed: %d\n", ret);
+					return ret;
+				}
 			}
 			break;