add usb charge config

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 4f4ffb692431e9d225ceffabf654c0ae8f8c8195..a2ea67471c39349054fe27c4fa866c6d7b34ab05 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -404,6 +404,14 @@ config BATTERY_RK30_ADC_FAC
         help
           Say Y to enable support for the battery on the RK30.
 
+config BATTERY_RK30_USB_CHARGE
+        tristate "RK30 USB CHARGE"
+        depends on BATTERY_RK30_ADC||BATTERY_RK30_ADC_FAC
+        default y
+        help
+          say Y to enable suspport for the USB battery charge
+
+
 config CHARGER_BQ2415X
        tristate "TI BQ2415x battery charger driver"
        depends on I2C

diff --git a/drivers/power/rk30_factory_adc_battery.c b/drivers/power/rk30_factory_adc_battery.c
index d1c8cce46b2fe321977918ea992f13047daaa33e..29eccb739a9e9ef7013bb30bbe24da9881e80195 100755 (executable)
--- a/drivers/power/rk30_factory_adc_battery.c
+++ b/drivers/power/rk30_factory_adc_battery.c
@@ -2459,6 +2459,7 @@ err_sysfs:
 err_ac_failed:
        power_supply_unregister(&data ->ac);
 
+err_usb_failed:
 err_battery_failed:
        power_supply_unregister(&data ->bat);