Merge branch 'power-supply-scope' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / power / max8997_charger.c

diff --git a/drivers/power/max8997_charger.c b/drivers/power/max8997_charger.c
index a23317d75c5a80e65bec82fdf89bdb1f6499f0a1..23ca65d177059481687e2c9705d5954716154ca2 100644 (file)
--- a/drivers/power/max8997_charger.c
+++ b/drivers/power/max8997_charger.c
@@ -98,7 +98,7 @@ static __devinit int max8997_battery_probe(struct platform_device *pdev)
                return -EINVAL;
 
        if (pdata->eoc_mA) {
-               u8 val = (pdata->eoc_mA - 50) / 10;
+               int val = (pdata->eoc_mA - 50) / 10;
                if (val < 0)
                        val = 0;
                if (val > 0xf)
@@ -179,6 +179,7 @@ static int __devexit max8997_battery_remove(struct platform_device *pdev)
 
 static const struct platform_device_id max8997_battery_id[] = {
        { "max8997-battery", 0 },
+       { }
 };
 
 static struct platform_driver max8997_battery_driver = {