power: rk81x-battery: fix dwc_otg_check_dpdm declare error
authorJianhong Chen <chenjh@rock-chips.com>
Wed, 17 Jun 2015 01:50:10 +0000 (09:50 +0800)
committer许盛飞 <xsf@rock-chips.com>
Wed, 17 Jun 2015 06:57:50 +0000 (14:57 +0800)
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
drivers/power/rk818_battery.c
drivers/power/rk818_battery.h

index 81742a7975b3c8f302844ace4bb80f4d7bdf708d..5ce82021deb6f3acbe73051a55f2979ce6bbe221 100644 (file)
@@ -1786,7 +1786,7 @@ static enum charger_type rk81x_bat_get_dc_state(struct rk81x_battery *di)
        /*HW_ADP_TYPE_DUAL: det by rk818 and usb*/
        } else if (rk81x_bat_support_adp_type(HW_ADP_TYPE_DUAL)) {
                if ((buf & PLUG_IN_STS) != 0) {
-                       charger_type = dwc_otg_check_dpdm();
+                       charger_type = dwc_otg_check_dpdm(0);
                        if (charger_type == 0)
                                charger_type = DC_CHARGER;
                        else
@@ -1802,7 +1802,7 @@ static enum charger_type rk81x_bat_get_usbac_state(struct rk81x_battery *di)
        enum charger_type charger_type;
        int usb_id, gadget_flag;
 
-       usb_id = dwc_otg_check_dpdm();
+       usb_id = dwc_otg_check_dpdm(0);
        switch (usb_id) {
        case 0:
                charger_type = NO_CHARGER;
index 7e358d6c1679ce489fdeb4f7f0e7c1f0d95cab5b..e8b9e6aab24ad7accc40d3bf8b01e8902f8afd68 100644 (file)
@@ -660,7 +660,7 @@ void kernel_power_off(void);
 #if defined(CONFIG_ARCH_ROCKCHIP)
 int dwc_vbus_status(void);
 int get_gadget_connect_flag(void);
-int dwc_otg_check_dpdm(void);
+int dwc_otg_check_dpdm(bool wait);
 void rk_send_wakeup_key(void);
 #else
 
@@ -669,7 +669,7 @@ static inline int get_gadget_connect_flag(void)
        return 0;
 }
 
-static inline int dwc_otg_check_dpdm(void)
+static inline int dwc_otg_check_dpdm(bool wait)
 {
        return 0;
 }