From: 许盛飞 <xsf@rock-chips.com>
Date: Fri, 17 Oct 2014 02:36:52 +0000 (+0800)
Subject: chargedisplay: add for adc-battery-driver
X-Git-Tag: firefly_0821_release~4569
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=12bd489d4d3cc304d17233298716246f6040a9b3;p=firefly-linux-kernel-4.4.55.git

chargedisplay: add for adc-battery-driver

Signed-off-by: 许盛飞 <xsf@rock-chips.com>
---

diff --git a/drivers/power/rk29_charger_display.c b/drivers/power/rk29_charger_display.c
index af377b17e97c..407486f68bf0 100755
--- a/drivers/power/rk29_charger_display.c
+++ b/drivers/power/rk29_charger_display.c
@@ -127,7 +127,7 @@ static int  __init start_charge_logo_display(void)
 
 	if(val_status.intval == POWER_SUPPLY_STATUS_CHARGING)
 	{
-		if (((rockchip_boot_mode() == BOOT_MODE_NORMAL) ||(rockchip_boot_mode() == BOOT_MODE_CHARGE)) && (val_capacity.intval <= pwr_on_thrsd))  
+		if (((rockchip_boot_mode() == BOOT_MODE_NORMAL) || (rockchip_boot_mode() == BOOT_MODE_CHARGE)) || (val_capacity.intval <= pwr_on_thrsd))
 	    {			
 			add_bootmode_charger_to_cmdline();
 			printk("power in charge mode %d %d  %d\n\n",rockchip_boot_mode(),val_capacity.intval,pwr_on_thrsd);
@@ -137,5 +137,5 @@ static int  __init start_charge_logo_display(void)
 	return 0;
 } 
 
-module_init(start_charge_logo_display);
+late_initcall(start_charge_logo_display);
 #endif