From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759479Ab1JGEwN (ORCPT ); Fri, 7 Oct 2011 00:52:13 -0400 Received: from [117.192.88.236] ([117.192.88.236]:60585 "EHLO manju-desktop" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1755872Ab1JGEwM (ORCPT ); Fri, 7 Oct 2011 00:52:12 -0400 To: linux-arm-kernel@lists.infradead.org Date: Fri, 07 Oct 2011 10:05:25 +0500 Subject: [PATCH 3/5] regulator: Support driver probe deferral References: <1317962127-29003-1-git-send-email-manjugk@ti.com> CC: Mark Brown , linux-omap@vger.kernel.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Grant Likely , Greg Kroah-Hartman , Dilan Lee , Manjunath GKondaiah , Arnd Bergmann Message-ID: <1317962127-29003-4-git-send-email-manjugk@ti.com> From: "G, Manjunath Kondaiah" X-Mailer: git-send-email 1.7.4.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mark Brown If we fail to locate a requested regulator return -EPROBE_DEFER. If drivers pass this error code through to their caller (which they really should) then this will ensure that the probe is retried later when further devices become available. Signed-off-by: Mark Brown [manjugk@ti.com: changed error value from EAGAIN to EPROBE_DEFER] Signed-off-by: G, Manjunath Kondaiah Acked-by: Grant Likely Acked-by: Liam Girdwood --- Cc: linux-omap@vger.kernel.org Cc: linux-mmc@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: Grant Likely Cc: Greg Kroah-Hartman Cc: Dilan Lee Cc: Mark Brown Cc: Manjunath GKondaiah Cc: Arnd Bergmann drivers/regulator/core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index d8e6a42..95dfd21 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1153,7 +1153,7 @@ static struct regulator *_regulator_get(struct device *dev, const char *id, { struct regulator_dev *rdev; struct regulator_map *map; - struct regulator *regulator = ERR_PTR(-ENODEV); + struct regulator *regulator = ERR_PTR(-EPROBE_DEFER); const char *devname = NULL; int ret; @@ -2668,7 +2668,7 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc, if (!found) { dev_err(dev, "Failed to find supply %s\n", init_data->supply_regulator); - ret = -ENODEV; + ret = -EPROBE_DEFER; goto scrub; } -- 1.7.4.1