X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=drivers%2Fpower%2Frk29_adc_battery.c;h=e2c861c72e49eef7db2209e2bb102bcf2a76686f;hb=77bab04357900ac51406698753fbcdca95caa01e;hp=8ed049bb4ee1100def2e1c2f7c0ecf26482a66d6;hpb=21158e22d9a60b79f79d58b66b9909e06006d930;p=firefly-linux-kernel-4.4.55.git diff --git a/drivers/power/rk29_adc_battery.c b/drivers/power/rk29_adc_battery.c index 8ed049bb4ee1..e2c861c72e49 100644 --- a/drivers/power/rk29_adc_battery.c +++ b/drivers/power/rk29_adc_battery.c @@ -126,7 +126,7 @@ static struct batt_vol_cal batt_table[BATT_NUM] = { /********************************************************************************/ extern int dwc_vbus_status(void); -extern int get_msc_connect_flag(void); +extern int get_gadget_connect_flag(void); struct rk29_adc_battery_data { int irq; @@ -259,7 +259,7 @@ static int rk29_adc_battery_get_charge_level(struct rk29_adc_battery_data *bat) return; if (1 == dwc_vbus_status()) { //¼ì²âµ½USB²åÈ룬µ«ÊÇÎÞ·¨Ê¶±ðÊÇ·ñÊdzäµçÆ÷ //ͨ¹ýÑÓʱ¼ì²âPCʶ±ð±êÖ¾£¬Èç¹û³¬Ê±¼ì²â²»µ½£¬ËµÃ÷Êdzäµç - if (0 == get_msc_connect_flag()){ //²åÈë³äµçÆ÷ʱ¼ä´óÓÚÒ»¶¨Ê±¼äÖ®ºó£¬¿ªÊ¼½øÈë³äµç״̬ + if (1 == get_gadget_connect_flag()){ //²åÈë³äµçÆ÷ʱ¼ä´óÓÚÒ»¶¨Ê±¼äÖ®ºó£¬¿ªÊ¼½øÈë³äµç״̬ if (++gBatUsbChargeCnt >= NUM_USBCHARGE_IDENTIFY_TIMES){ gBatUsbChargeCnt = NUM_USBCHARGE_IDENTIFY_TIMES + 1; charge_on = 1;