shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 12:57:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

power: rk81x-battery: fix dwc_otg_check_dpdm declare error

Browse Source 
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
This commit is contained in:
Jianhong Chen
2015-06-17 09:50:10 +08:00
committed by 许盛飞
parent 2546580dcb
commit 67fcb6b630
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/power/rk818_battery.c
View 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;

4
drivers/power/rk818_battery.h
View 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;
}