Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2536543 authored by Sachin Kamat's avatar Sachin Kamat Committed by Chanwoo Choi
Browse files

extcon: max77693: Fix return value 



Return the value obtained from the function instead of hardcoding.
Silences the following warnings:
drivers/extcon/extcon-max77693.c:297 max77693_muic_set_path()
info: why not propagate 'ret' from max77693_update_reg() instead of (-11)?
drivers/extcon/extcon-max77693.c:310 max77693_muic_set_path()
info: why not propagate 'ret' from max77693_update_reg() instead of (-11)?

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: default avatarMyungjoo Ham <myungjoo.ham@samsung.com>
parent 6ed28105

drivers/extcon/extcon-max77693.c

+4 −4
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static int max77693_muic_set_debounce_time(struct max77693_muic_info *info, 
					  CONTROL3_ADCDBSET_MASK);

		if (ret) {

			dev_err(info->dev, "failed to set ADC debounce time\n");

			return -EAGAIN;

			return ret;

		}

		break;

	default:
@@ -294,7 +294,7 @@ static int max77693_muic_set_path(struct max77693_muic_info *info, 
			MAX77693_MUIC_REG_CTRL1, ctrl1, COMP_SW_MASK);

	if (ret < 0) {

		dev_err(info->dev, "failed to update MUIC register\n");

		return -EAGAIN;

		return ret;

	}



	if (attached)
@@ -307,7 +307,7 @@ static int max77693_muic_set_path(struct max77693_muic_info *info, 
			CONTROL2_LOWPWR_MASK | CONTROL2_CPEN_MASK);

	if (ret < 0) {

		dev_err(info->dev, "failed to update MUIC register\n");

		return -EAGAIN;

		return ret;

	}



	dev_info(info->dev,
@@ -1035,7 +1035,7 @@ static int max77693_muic_detect_accessory(struct max77693_muic_info *info) 
	if (ret) {

		dev_err(info->dev, "failed to read MUIC register\n");

		mutex_unlock(&info->mutex);

		return -EINVAL;

		return ret;

	}



	adc = max77693_muic_get_cable_type(info, MAX77693_CABLE_GROUP_ADC,