From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932610AbaGENWn (ORCPT ); Sat, 5 Jul 2014 09:22:43 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:42478 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753570AbaGENWi (ORCPT ); Sat, 5 Jul 2014 09:22:38 -0400 From: Beniamino Galvani To: Liam Girdwood , Mark Brown Cc: Wenyou Yang , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Heiko Stuebner , Axel Lin , devicetree@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Beniamino Galvani Subject: [PATCH v2 1/4] regulator: act8865: set correct number of regulators in pdata Date: Sat, 5 Jul 2014 15:20:53 +0200 Message-Id: <1404566456-9121-2-git-send-email-b.galvani@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1404566456-9121-1-git-send-email-b.galvani@gmail.com> References: <1404566456-9121-1-git-send-email-b.galvani@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org act8865_pdata_from_dt() populates the array pdata->regulators with all the regulators and then assigns the field init_data only for the ones actually found in the DT. The patch changes the value assigned to pdata->num_regulators to match the size of the array. Signed-off-by: Beniamino Galvani Tested-by: Wenyou Yang --- drivers/regulator/act8865-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c index f07be36..52d1b6c 100644 --- a/drivers/regulator/act8865-regulator.c +++ b/drivers/regulator/act8865-regulator.c @@ -230,7 +230,7 @@ static int act8865_pdata_from_dt(struct device *dev, if (!pdata->regulators) return -ENOMEM; - pdata->num_regulators = matched; + pdata->num_regulators = ARRAY_SIZE(act8865_matches); regulator = pdata->regulators; for (i = 0; i < ARRAY_SIZE(act8865_matches); i++) { -- 1.7.10.4