From patchwork Fri Jul 26 09:18:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Chen X-Patchwork-Id: 2833963 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5FB1B9F243 for ; Fri, 26 Jul 2013 10:11:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 63F0020149 for ; Fri, 26 Jul 2013 10:11:55 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 09BEF20148 for ; Fri, 26 Jul 2013 10:11:54 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V2eEi-0000eg-QY; Fri, 26 Jul 2013 09:22:58 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V2eDu-0002r7-N7; Fri, 26 Jul 2013 09:22:06 +0000 Received: from mail-db8lp0187.outbound.messaging.microsoft.com ([213.199.154.187] helo=db8outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V2eC7-0002gM-Q8 for linux-arm-kernel@lists.infradead.org; Fri, 26 Jul 2013 09:20:17 +0000 Received: from mail210-db8-R.bigfish.com (10.174.8.233) by DB8EHSOBE042.bigfish.com (10.174.4.105) with Microsoft SMTP Server id 14.1.225.22; Fri, 26 Jul 2013 09:19:53 +0000 Received: from mail210-db8 (localhost [127.0.0.1]) by mail210-db8-R.bigfish.com (Postfix) with ESMTP id AF194380433; Fri, 26 Jul 2013 09:19:53 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1f42h208ch1ee6h1de0h1fdah2073h1202h1e76h1d1ah1d2ah1fc6hzz1de098h1de097h8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h1354h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1d0ch1d2eh1d3fh1dfeh1dffh1e23h1155h) Received: from mail210-db8 (localhost.localdomain [127.0.0.1]) by mail210-db8 (MessageSwitch) id 1374830338602608_6462; Fri, 26 Jul 2013 09:18:58 +0000 (UTC) Received: from DB8EHSMHS025.bigfish.com (unknown [10.174.8.244]) by mail210-db8.bigfish.com (Postfix) with ESMTP id BB6DF30008B; Fri, 26 Jul 2013 09:18:51 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB8EHSMHS025.bigfish.com (10.174.4.35) with Microsoft SMTP Server (TLS) id 14.16.227.3; Fri, 26 Jul 2013 09:18:51 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-005.039d.mgd.msft.net (10.84.1.17) with Microsoft SMTP Server (TLS) id 14.3.136.1; Fri, 26 Jul 2013 09:18:48 +0000 Received: from localhost.localdomain (nchen-desktop.ap.freescale.net [10.192.242.40]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r6Q9IVUM015357; Fri, 26 Jul 2013 02:18:45 -0700 From: Peter Chen To: Subject: [PATCH v13 03/14] usb: chipidea: imx: add return value check for devm_regulator_get Date: Fri, 26 Jul 2013 17:18:19 +0800 Message-ID: <1374830310-21765-4-git-send-email-peter.chen@freescale.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1374830310-21765-1-git-send-email-peter.chen@freescale.com> References: <1374830310-21765-1-git-send-email-peter.chen@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130726_052016_111519_8A682A86 X-CRM114-Status: GOOD ( 12.14 ) X-Spam-Score: -1.9 (-) Cc: marex@denx.de, m.grzeschik@pengutronix.de, frank.li@freescale.com, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, mkl@pengutronix.de, kernel@pengutronix.de, maxime.ripard@free-electrons.com, shawn.guo@linaro.org, festevam@gmail.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP - If devm_regulator_get returns -EPROBE_DEFER, we also return -EPROBE_DEFER to wait regulator being ready later. - If devm_regulator_get returns -ENODEV, we think there is no "vbus-supply" node at DT, it means this board doesn't need vbus control. - If devm_regulator_get returns other error values, it means there are something wrong for getting this regulator. Signed-off-by: Peter Chen --- drivers/usb/chipidea/ci_hdrc_imx.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c index d06355e..0ced8c1 100644 --- a/drivers/usb/chipidea/ci_hdrc_imx.c +++ b/drivers/usb/chipidea/ci_hdrc_imx.c @@ -144,8 +144,18 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) /* Get the vbus regulator */ pdata.reg_vbus = devm_regulator_get(&pdev->dev, "vbus"); - if (IS_ERR(pdata.reg_vbus)) - pdata.reg_vbus = NULL; + if (PTR_ERR(pdata.reg_vbus) == -EPROBE_DEFER) { + ret = -EPROBE_DEFER; + goto err_clk; + } else if (PTR_ERR(pdata.reg_vbus) == -ENODEV) { + pdata.reg_vbus = NULL; /* no vbus regualator is needed */ + } else if (IS_ERR(pdata.reg_vbus)) { + dev_err(&pdev->dev, + "Getting regulator error: %ld\n", + PTR_ERR(pdata.reg_vbus)); + ret = PTR_ERR(pdata.reg_vbus); + goto err_clk; + } if (!pdev->dev.dma_mask) pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;