From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934647AbbDJOAR (ORCPT ); Fri, 10 Apr 2015 10:00:17 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:36830 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934596AbbDJOAN (ORCPT ); Fri, 10 Apr 2015 10:00:13 -0400 From: Markus Pargmann To: Mark Brown Cc: Liam Girdwood , Wolfram Sang , kernel@pengutronix.de, linux-kernel@vger.kernel.org, Markus Pargmann Subject: [PATCH v2] regulator: max8660: Handle empty regulator data Date: Fri, 10 Apr 2015 15:23:42 +0200 Message-Id: <1428672222-8234-1-git-send-email-mpa@pengutronix.de> X-Mailer: git-send-email 2.1.4 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: mpa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It is not necessary to have regulator init data for a regulator. This patch removes the necessity of this data and handles a NULL pointer properly. Signed-off-by: Markus Pargmann --- drivers/regulator/max8660.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c index 7eee2ca18541..1d38d5d1d7b0 100644 --- a/drivers/regulator/max8660.c +++ b/drivers/regulator/max8660.c @@ -443,9 +443,9 @@ static int max8660_probe(struct i2c_client *client, for (i = 0; i < pdata->num_subdevs; i++) { if (!pdata->subdevs[i].platform_data) - return ret; - - boot_on = pdata->subdevs[i].platform_data->constraints.boot_on; + boot_on = false; + else + boot_on = pdata->subdevs[i].platform_data->constraints.boot_on; switch (pdata->subdevs[i].id) { case MAX8660_V3: -- 2.1.4