Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754335AbaGEPIJ (ORCPT ); Sat, 5 Jul 2014 11:08:09 -0400 Received: from mail-qg0-f44.google.com ([209.85.192.44]:59647 "EHLO mail-qg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752771AbaGEPIG (ORCPT ); Sat, 5 Jul 2014 11:08:06 -0400 MIME-Version: 1.0 X-Originating-IP: [218.164.146.19] In-Reply-To: <1404566456-9121-2-git-send-email-b.galvani@gmail.com> References: <1404566456-9121-1-git-send-email-b.galvani@gmail.com> <1404566456-9121-2-git-send-email-b.galvani@gmail.com> Date: Sat, 5 Jul 2014 23:08:05 +0800 Message-ID: Subject: Re: [PATCH v2 1/4] regulator: act8865: set correct number of regulators in pdata From: Axel Lin To: Beniamino Galvani Cc: Liam Girdwood , Mark Brown , Wenyou Yang , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Heiko Stuebner , devicetree@vger.kernel.org, linux-doc@vger.kernel.org, "linux-kernel@vger.kernel.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2014-07-05 21:20 GMT+08:00 Beniamino Galvani : > 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; You can also include below change as well: diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c index f07be36..9fcedc5 100644 --- a/drivers/regulator/act8865-regulator.c +++ b/drivers/regulator/act8865-regulator.c @@ -226,7 +226,7 @@ static int act8865_pdata_from_dt(struct device *dev, pdata->regulators = devm_kzalloc(dev, sizeof(struct act8865_regulator_data) * - ARRAY_SIZE(act8865_matches), GFP_KERNEL); + matched, GFP_KERNEL); if (!pdata->regulators) return -ENOMEM; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/