This patch fix bug when checking cable type. SM5502 have to use ADC value
to get correct cable type and fix warning message about coding style.
drivers/extcon/extcon-sm5502.c:398 sm5502_muic_cable_handler()
warn: we tested 'attached' before and it was 'false'
Signed-off-by: Chanwoo Choi <[email protected]>
---
drivers/extcon/extcon-sm5502.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/extcon/extcon-sm5502.c b/drivers/extcon/extcon-sm5502.c
index aab630e..2555974 100644
--- a/drivers/extcon/extcon-sm5502.c
+++ b/drivers/extcon/extcon-sm5502.c
@@ -282,7 +282,7 @@ static int sm5502_muic_set_path(struct sm5502_muic_info
*info,
/* Return cable type of attached or detached accessories */
static unsigned int sm5502_muic_get_cable_type(struct sm5502_muic_info *info)
{
- unsigned int cable_type = -1, adc, dev_type1;
+ unsigned int adc, cable_type, dev_type1;
int ret;
/* Read ADC value according to external cable or button */
@@ -296,7 +296,7 @@ static unsigned int sm5502_muic_get_cable_type(struct
sm5502_muic_info *info)
* If ADC is SM5502_MUIC_ADC_GROUND(0x0), external cable hasn't
* connected with to MUIC device.
*/
- cable_type &= SM5502_REG_ADC_MASK;
+ cable_type = adc & SM5502_REG_ADC_MASK;
if (cable_type == SM5502_MUIC_ADC_GROUND)
return SM5502_MUIC_ADC_GROUND;
@@ -391,7 +391,7 @@ static int sm5502_muic_cable_handler(struct
sm5502_muic_info *info,
/* Get the type of attached or detached cable */
if (attached)
cable_type = sm5502_muic_get_cable_type(info);
- else if (!attached)
+ else
cable_type = prev_cable_type;
prev_cable_type = cable_type;
--
1.8.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
