Merge branches 'ib-mfd-4.19', 'ib-mfd-gpio-pinctrl-4.19', 'ib-mfd-i915-media-platform...

[linux-2.6-microblaze.git] / drivers / pinctrl / pinctrl-ingenic.c

diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c
index ac38a3f..a1d7156 100644 (file)
--- a/drivers/pinctrl/pinctrl-ingenic.c
+++ b/drivers/pinctrl/pinctrl-ingenic.c
@@ -770,8 +770,8 @@ static int ingenic_pinctrl_probe(struct platform_device *pdev)
        pctl_desc->pmxops = &ingenic_pmxops;
        pctl_desc->confops = &ingenic_confops;
        pctl_desc->npins = chip_info->num_chips * PINS_PER_GPIO_CHIP;
-       pctl_desc->pins = jzpc->pdesc = devm_kzalloc(&pdev->dev,
-                       sizeof(*jzpc->pdesc) * pctl_desc->npins, GFP_KERNEL);
+       pctl_desc->pins = jzpc->pdesc = devm_kcalloc(&pdev->dev,
+                       pctl_desc->npins, sizeof(*jzpc->pdesc), GFP_KERNEL);
        if (!jzpc->pdesc)
                return -ENOMEM;