From patchwork Wed Aug 31 12:30:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Vincent_Stehl=C3=A9?= X-Patchwork-Id: 664519 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sPPts2SdDz9ryk for ; Wed, 31 Aug 2016 22:33:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934016AbcHaMdP (ORCPT ); Wed, 31 Aug 2016 08:33:15 -0400 Received: from mga07.intel.com ([134.134.136.100]:44084 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933992AbcHaMdN (ORCPT ); Wed, 31 Aug 2016 08:33:13 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP; 31 Aug 2016 05:33:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,261,1470726000"; d="scan'208";a="1033590283" Received: from jazz.nc.intel.com (HELO localhost) ([10.217.217.157]) by fmsmga001.fm.intel.com with ESMTP; 31 Aug 2016 05:33:11 -0700 Received: from vincents by localhost with local (Exim 4.87) (envelope-from ) id 1bf4fW-0003Rc-Rd; Wed, 31 Aug 2016 14:31:02 +0200 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= To: linux-gpio@vger.kernel.org Cc: linux-kernel@vger.kernel.org, =?UTF-8?q?Vincent=20Stehl=C3=A9?= , Andy Shevchenko , Linus Walleij Subject: [PATCH] pinctrl: intel: merrifield: fix dup size in probe Date: Wed, 31 Aug 2016 14:30:50 +0200 Message-Id: <20160831123050.13202-1-vincent.stehle@intel.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <1466678976-52598-1-git-send-email-andriy.shevchenko@linux.intel.com> References: <1466678976-52598-1-git-send-email-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org 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é Cc: Andy Shevchenko Cc: Linus Walleij Acked-by: Andy Shevchenko --- drivers/pinctrl/intel/pinctrl-merrifield.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/intel/pinctrl-merrifield.c b/drivers/pinctrl/intel/pinctrl-merrifield.c index 7fb7656..7826c7f 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) */ nfamilies = ARRAY_SIZE(mrfld_families), families = devm_kmemdup(&pdev->dev, mrfld_families, - nfamilies * sizeof(mrfld_families), + sizeof(mrfld_families), GFP_KERNEL); if (!families) return -ENOMEM;