diff options
author | Vincent Stehlé <vincent.stehle@intel.com> | 2016-08-31 08:30:50 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2016-09-12 09:45:16 -0400 |
commit | c11a0442b0fe01244de09849f62a0370482a0196 (patch) | |
tree | 07427d2674604ef46908f9c5dc9553510a34b692 /drivers/pinctrl | |
parent | 9395452b4aab7bc2475ef8935b4a4fb99d778d70 (diff) |
pinctrl: intel: merrifield: fix dup size in probe
In function mrfld_pinctrl_probe(), when duplicating the mrfld_families
array the requested memory region length is multiplied once too many by the
number of elements in the original array. Fix this to spare some memory.
Fixes: 4e80c8f505741cbd ("pinctrl: intel: Add Intel Merrifield pin controller support")
Signed-off-by: Vincent Stehlé <vincent.stehle@intel.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r-- | drivers/pinctrl/intel/pinctrl-merrifield.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/intel/pinctrl-merrifield.c b/drivers/pinctrl/intel/pinctrl-merrifield.c index 7fb765642ee7..7826c7f0cb7c 100644 --- a/drivers/pinctrl/intel/pinctrl-merrifield.c +++ b/drivers/pinctrl/intel/pinctrl-merrifield.c | |||
@@ -854,7 +854,7 @@ static int mrfld_pinctrl_probe(struct platform_device *pdev) | |||
854 | */ | 854 | */ |
855 | nfamilies = ARRAY_SIZE(mrfld_families), | 855 | nfamilies = ARRAY_SIZE(mrfld_families), |
856 | families = devm_kmemdup(&pdev->dev, mrfld_families, | 856 | families = devm_kmemdup(&pdev->dev, mrfld_families, |
857 | nfamilies * sizeof(mrfld_families), | 857 | sizeof(mrfld_families), |
858 | GFP_KERNEL); | 858 | GFP_KERNEL); |
859 | if (!families) | 859 | if (!families) |
860 | return -ENOMEM; | 860 | return -ENOMEM; |