From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753767AbbKBL1w (ORCPT ); Mon, 2 Nov 2015 06:27:52 -0500 Received: from mo4-p00-ob.smtp.rzone.de ([81.169.146.220]:16895 "EHLO mo4-p00-ob.smtp.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752987AbbKBL1m (ORCPT ); Mon, 2 Nov 2015 06:27:42 -0500 X-RZG-AUTH: :JGIXVUS7cutRB/49FwqZ7WcecEarQROEYabkiUo6mSAGQ+qKIDkoJ1Fv X-RZG-CLASS-ID: mo00 From: "H. Nikolaus Schaller" To: =?UTF-8?q?Gra=C5=BEvydas=20Ignotas?= , Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse , Andreas Kemnade Cc: linux-pm@vger.kernel.org, gta04-owner@goldelico.com, linux-kernel@vger.kernel.org, "H. Nikolaus Schaller" Subject: [PATCH v2 1/3] drivers:power:twl4030-charger: fix problem with EPROBE_DEFER Date: Mon, 2 Nov 2015 12:27:34 +0100 Message-Id: <701c4f311e81dab4b3218cfe03bb9faa2da37747.1446463653.git.hns@goldelico.com> X-Mailer: git-send-email 2.5.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the phy-twol4030-usb driver is compiled as a module, devm_usb_get_phy_by_node() may return -EPROBE_DEFER in which case we should also defer probing of the twl4030 charger instead of turning USB charging off (forever or until next reboot) further down in code. Signed-off-by: H. Nikolaus Schaller --- drivers/power/twl4030_charger.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c index 74f2d3f..00697e9 100644 --- a/drivers/power/twl4030_charger.c +++ b/drivers/power/twl4030_charger.c @@ -1057,9 +1057,13 @@ static int twl4030_bci_probe(struct platform_device *pdev) phynode = of_find_compatible_node(bci->dev->of_node->parent, NULL, "ti,twl4030-usb"); - if (phynode) + if (phynode) { bci->transceiver = devm_usb_get_phy_by_node( bci->dev, phynode, &bci->usb_nb); + if (IS_ERR(bci->transceiver) && + PTR_ERR(bci->transceiver) == -EPROBE_DEFER) + return -EPROBE_DEFER; /* PHY not ready */ + } } /* Enable interrupts now. */ -- 2.5.1