aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/extcon/extcon-max8997.c
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-04-07 20:13:18 -0400
committerChanwoo Choi <cw00.choi@samsung.com>2013-04-08 18:53:46 -0400
commit3ad9e86d54ed2770aa693a90a0872cbe7ffc6831 (patch)
treeecc8e3afa3a8e276eddba3a5427756d1ef4e00ca /drivers/extcon/extcon-max8997.c
parentc2536543d53be247786b8beb7c505c629fd55813 (diff)
extcon: max8997: Fix return value
Return the value obtained from the function instead of hardcoding. Fixes the following warnings: drivers/extcon/extcon-max8997.c:235 max8997_muic_set_path() info: why not propagate 'ret' from max8997_update_reg() instead of (-11)? drivers/extcon/extcon-max8997.c:248 max8997_muic_set_path() info: why not propagate 'ret' from max8997_update_reg() instead of (-11)? Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Myungjoo Ham <myungjoo.ham@samsung.com>
Diffstat (limited to 'drivers/extcon/extcon-max8997.c')
-rw-r--r--drivers/extcon/extcon-max8997.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c
index 20772ad4adc0..67d6738d85a0 100644
--- a/drivers/extcon/extcon-max8997.c
+++ b/drivers/extcon/extcon-max8997.c
@@ -196,7 +196,7 @@ static int max8997_muic_set_debounce_time(struct max8997_muic_info *info,
196 CONTROL3_ADCDBSET_MASK); 196 CONTROL3_ADCDBSET_MASK);
197 if (ret) { 197 if (ret) {
198 dev_err(info->dev, "failed to set ADC debounce time\n"); 198 dev_err(info->dev, "failed to set ADC debounce time\n");
199 return -EAGAIN; 199 return ret;
200 } 200 }
201 break; 201 break;
202 default: 202 default:
@@ -232,7 +232,7 @@ static int max8997_muic_set_path(struct max8997_muic_info *info,
232 MAX8997_MUIC_REG_CONTROL1, ctrl1, COMP_SW_MASK); 232 MAX8997_MUIC_REG_CONTROL1, ctrl1, COMP_SW_MASK);
233 if (ret < 0) { 233 if (ret < 0) {
234 dev_err(info->dev, "failed to update MUIC register\n"); 234 dev_err(info->dev, "failed to update MUIC register\n");
235 return -EAGAIN; 235 return ret;
236 } 236 }
237 237
238 if (attached) 238 if (attached)
@@ -245,7 +245,7 @@ static int max8997_muic_set_path(struct max8997_muic_info *info,
245 CONTROL2_LOWPWR_MASK | CONTROL2_CPEN_MASK); 245 CONTROL2_LOWPWR_MASK | CONTROL2_CPEN_MASK);
246 if (ret < 0) { 246 if (ret < 0) {
247 dev_err(info->dev, "failed to update MUIC register\n"); 247 dev_err(info->dev, "failed to update MUIC register\n");
248 return -EAGAIN; 248 return ret;
249 } 249 }
250 250
251 dev_info(info->dev, 251 dev_info(info->dev,
@@ -397,7 +397,7 @@ static int max8997_muic_handle_jig_uart(struct max8997_muic_info *info,
397 ret = max8997_muic_set_path(info, info->path_uart, attached); 397 ret = max8997_muic_set_path(info, info->path_uart, attached);
398 if (ret) { 398 if (ret) {
399 dev_err(info->dev, "failed to update muic register\n"); 399 dev_err(info->dev, "failed to update muic register\n");
400 return -EINVAL; 400 return ret;
401 } 401 }
402 402
403 extcon_set_cable_state(info->edev, "JIG", attached); 403 extcon_set_cable_state(info->edev, "JIG", attached);
@@ -608,7 +608,7 @@ static int max8997_muic_detect_dev(struct max8997_muic_info *info)
608 if (ret) { 608 if (ret) {
609 dev_err(info->dev, "failed to read MUIC register\n"); 609 dev_err(info->dev, "failed to read MUIC register\n");
610 mutex_unlock(&info->mutex); 610 mutex_unlock(&info->mutex);
611 return -EINVAL; 611 return ret;
612 } 612 }
613 613
614 adc = max8997_muic_get_cable_type(info, MAX8997_CABLE_GROUP_ADC, 614 adc = max8997_muic_get_cable_type(info, MAX8997_CABLE_GROUP_ADC,