Merge remote-tracking branches 'regmap/topic/irq', 'regmap/topic/le', 'regmap/topic...

[firefly-linux-kernel-4.4.55.git] / drivers / base / regmap / regmap.c

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index a1beffb4b066c260f14a53091f893edc9cde38c6..2615cc180d35401961304eb94d60144241efa147 100644 (file)
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1667,6 +1667,9 @@ static int _regmap_raw_multi_reg_write(struct regmap *map,
        size_t pair_size = reg_bytes + pad_bytes + val_bytes;
        size_t len = pair_size * num_regs;
 
+       if (!len)
+               return -EINVAL;
+
        buf = kzalloc(len, GFP_KERNEL);
        if (!buf)
                return -ENOMEM;
@@ -1714,7 +1717,7 @@ static int _regmap_range_multi_paged_reg_write(struct regmap *map,
        int ret;
        int i, n;
        struct reg_default *base;
-       unsigned int this_page;
+       unsigned int this_page = 0;
        /*
         * the set of registers are not neccessarily in order, but
         * since the order of write must be preserved this algorithm