[Gta04-owner] [PATCH 1/2] drivers:power:twl4030-charger: fix problem with EPROBE_DEFER

[H. Nikolaus Schaller]

Am 29.10.2015 um 20:52 schrieb Nishanth Menon <nm at ti.com>:

> On 10/29/2015 12:01 PM, H. Nikolaus Schaller wrote:
>> devm_usb_get_phy_by_node() may return -EPROBE_DEFER in which
>> case we should also defer probing of the twl4030 charger
>> instead of turing USB charging off (forever).
> 
> s/turing/turning

Thanks for noting this.

> 
>> 
>> Signed-off-by: H. Nikolaus Schaller <hns at goldelico.com>
>> ---
>> 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 423e886..859991f 100644
>> --- a/drivers/power/twl4030_charger.c
>> +++ b/drivers/power/twl4030_charger.c
>> @@ -1059,9 +1059,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)
> I might align this with the IS_ERR

Ok.

> 
>> +				return -EPROBE_DEFER;	/* PHY not ready */
>> +		}
>> 	}
>> 
>> 	/* Enable interrupts now. */
>> 
> 
> Otherwise it looks good to me.

I will update for v2.

BR,
Nikolaus Schaller
igitt