extcon: max8997: Fix return value
authorSachin Kamat <sachin.kamat@linaro.org>
Mon, 8 Apr 2013 00:13:18 +0000 (09:13 +0900)
committerChanwoo Choi <cw00.choi@samsung.com>
Mon, 8 Apr 2013 22:53:46 +0000 (07:53 +0900)
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>
drivers/extcon/extcon-max8997.c

index 20772ad4adc0eeebf63038c44c753dbf36832228..67d6738d85a00d514d3d4c6692e969331663abde 100644 (file)
@@ -196,7 +196,7 @@ static int max8997_muic_set_debounce_time(struct max8997_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:
@@ -232,7 +232,7 @@ static int max8997_muic_set_path(struct max8997_muic_info *info,
                        MAX8997_MUIC_REG_CONTROL1, ctrl1, COMP_SW_MASK);
        if (ret < 0) {
                dev_err(info->dev, "failed to update MUIC register\n");
-               return -EAGAIN;
+               return ret;
        }
 
        if (attached)
@@ -245,7 +245,7 @@ static int max8997_muic_set_path(struct max8997_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,
@@ -397,7 +397,7 @@ static int max8997_muic_handle_jig_uart(struct max8997_muic_info *info,
        ret = max8997_muic_set_path(info, info->path_uart, attached);
        if (ret) {
                dev_err(info->dev, "failed to update muic register\n");
-               return -EINVAL;
+               return ret;
        }
 
        extcon_set_cable_state(info->edev, "JIG", attached);
@@ -608,7 +608,7 @@ static int max8997_muic_detect_dev(struct max8997_muic_info *info)
        if (ret) {
                dev_err(info->dev, "failed to read MUIC register\n");
                mutex_unlock(&info->mutex);
-               return -EINVAL;
+               return ret;
        }
 
        adc = max8997_muic_get_cable_type(info, MAX8997_CABLE_GROUP_ADC,