Merge branch 'i2c/for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[thirdparty/kernel/linux.git] / drivers / i2c / muxes / i2c-mux-reg.c

diff --git a/drivers/i2c/muxes/i2c-mux-reg.c b/drivers/i2c/muxes/i2c-mux-reg.c
index c948e5a4cb045198cf6ffd61d698f9f759f47059..5653295b01cd35c2a701335f976641fb9946f260 100644 (file)
--- a/drivers/i2c/muxes/i2c-mux-reg.c
+++ b/drivers/i2c/muxes/i2c-mux-reg.c
@@ -124,13 +124,11 @@ static int i2c_mux_reg_probe_dt(struct regmux *mux,
        }
        mux->data.write_only = of_property_read_bool(np, "write-only");
 
-       values = devm_kzalloc(&pdev->dev,
-                             sizeof(*mux->data.values) * mux->data.n_values,
+       values = devm_kcalloc(&pdev->dev,
+                             mux->data.n_values, sizeof(*mux->data.values),
                              GFP_KERNEL);
-       if (!values) {
-               dev_err(&pdev->dev, "Cannot allocate values array");
+       if (!values)
                return -ENOMEM;
-       }
 
        for_each_child_of_node(np, child) {
                of_property_read_u32(child, "reg", values + i);