2 files changed, 22 insertions, 22 deletions

diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index 60529e0b3d67..cf07e289b4ea 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -256,6 +256,11 @@ static struct spi_board_info rx51_peripherals_spi_board_info[] __initdata = {
         },
 };
 
+static struct platform_device rx51_battery_device = {
+        .name   = "rx51-battery",
+        .id     = -1,
+};
+
 static void rx51_charger_set_power(bool on)
 {
         gpio_set_value(RX51_USB_TRANSCEIVER_RST_GPIO, on);
@@ -277,6 +282,7 @@ static void __init rx51_charger_init(void)
         WARN_ON(gpio_request_one(RX51_USB_TRANSCEIVER_RST_GPIO,
                 GPIOF_OUT_INIT_HIGH, "isp1704_reset"));
 
+        platform_device_register(&rx51_battery_device);
         platform_device_register(&rx51_charger_device);
 }
 
diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c
index adb3a4b59cb3..6ba047f5ac2c 100644
--- a/drivers/power/charger-manager.c
+++ b/drivers/power/charger-manager.c
@@ -239,44 +239,37 @@ static bool is_full_charged(struct charger_manager *cm)
         int uV;
 
         /* If there is no battery, it cannot be charged */
-        if (!is_batt_present(cm)) {
-                val.intval = 0;
-                goto out;
-        }
+        if (!is_batt_present(cm))
+                return false;
 
         if (cm->fuel_gauge && desc->fullbatt_full_capacity > 0) {
+                val.intval = 0;
+
                 /* Not full if capacity of fuel gauge isn't full */
                 ret = cm->fuel_gauge->get_property(cm->fuel_gauge,
                                 POWER_SUPPLY_PROP_CHARGE_FULL, &val);
-                if (!ret && val.intval > desc->fullbatt_full_capacity) {
-                        val.intval = 1;
-                        goto out;
-                }
+                if (!ret && val.intval > desc->fullbatt_full_capacity)
+                        return true;
         }
 
         /* Full, if it's over the fullbatt voltage */
         if (desc->fullbatt_uV > 0) {
                 ret = get_batt_uV(cm, &uV);
-                if (!ret && uV >= desc->fullbatt_uV) {
-                        val.intval = 1;
-                        goto out;
-                }
+                if (!ret && uV >= desc->fullbatt_uV)
+                        return true;
         }
 
         /* Full, if the capacity is more than fullbatt_soc */
         if (cm->fuel_gauge && desc->fullbatt_soc > 0) {
+                val.intval = 0;
+
                 ret = cm->fuel_gauge->get_property(cm->fuel_gauge,
                                 POWER_SUPPLY_PROP_CAPACITY, &val);
-                if (!ret && val.intval >= desc->fullbatt_soc) {
-                        val.intval = 1;
-                        goto out;
-                }
+                if (!ret && val.intval >= desc->fullbatt_soc)
+                        return true;
         }
 
-        val.intval = 0;
-
-out:
-        return val.intval ? true : false;
+        return false;
 }
 
 /**
@@ -489,8 +482,9 @@ static void fullbatt_vchk(struct work_struct *work)
                 return;
         }
 
-        diff = desc->fullbatt_uV;
-        diff -= batt_uV;
+        diff = desc->fullbatt_uV - batt_uV;
+        if (diff < 0)
+                return;
 
         dev_info(cm->dev, "VBATT dropped %duV after full-batt.\n", diff);