Merge branch 'for-4.19/upstream' into for-linus

[linux-2.6-block.git] / drivers / power / supply / z2_battery.c

diff --git a/drivers/power/supply/z2_battery.c b/drivers/power/supply/z2_battery.c
index 8a43b49cfd35f0966461ea0cca32847c9f55861e..bcc2d1a9b0a797fa0897d1357a053779143c5adc 100644 (file)
--- a/drivers/power/supply/z2_battery.c
+++ b/drivers/power/supply/z2_battery.c
@@ -146,7 +146,7 @@ static int z2_batt_ps_init(struct z2_charger *charger, int props)
        if (info->min_voltage >= 0)
                props++;        /* POWER_SUPPLY_PROP_VOLTAGE_MIN */
 
-       prop = kzalloc(props * sizeof(*prop), GFP_KERNEL);
+       prop = kcalloc(props, sizeof(*prop), GFP_KERNEL);
        if (!prop)
                return -ENOMEM;