From 67fcb6b630b83fa2b7ee97c35093bbb4f743ec47 Mon Sep 17 00:00:00 2001 From: Jianhong Chen Date: Wed, 17 Jun 2015 09:50:10 +0800 Subject: [PATCH] power: rk81x-battery: fix dwc_otg_check_dpdm declare error Signed-off-by: Jianhong Chen --- drivers/power/rk818_battery.c | 4 ++-- drivers/power/rk818_battery.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/power/rk818_battery.c b/drivers/power/rk818_battery.c index 81742a7975b3..5ce82021deb6 100644 --- a/drivers/power/rk818_battery.c +++ b/drivers/power/rk818_battery.c @@ -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; diff --git a/drivers/power/rk818_battery.h b/drivers/power/rk818_battery.h index 7e358d6c1679..e8b9e6aab24a 100644 --- a/drivers/power/rk818_battery.h +++ b/drivers/power/rk818_battery.h @@ -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; } -- 2.34.1