lkml.org 
[lkml]   [2018]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH v4] usb: dwc2: dwc2_vbus_supply_init: fix error check
From
Date
Hi Minas,

On 04/05/2018 09:54 AM, Minas Harutyunyan wrote:
> Hi Tomeu,
>
> On 3/26/2018 1:01 PM, Tomeu Vizoso wrote:
>> devm_regulator_get_optional returns -ENODEV if the regulator isn't
>> there, so if that's the case we have to make sure not to leave -ENODEV
>> in the regulator pointer.
>>
>> Also, make sure we return 0 in that case, but correctly propagate any
>> other errors. Also propagate the error from _dwc2_hcd_start.
>>
>> Fixes: 531ef5ebea96 ("usb: dwc2: add support for host mode external vbus supply")
>> Cc: Amelie Delaunay <amelie.delaunay@st.com>
>> Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
>>
>> ---
>>
>> v2: Only overwrite the error in the pointer after checking it (Heiko
>> Stübner <heiko@sntech.de>)
>> v3: Remove hunks that shouldn't be in this patch
>> v4: Don't overwrite the error code before returning it (kbuild test
>> robot <lkp@intel.com>)
>> ---
>> drivers/usb/dwc2/hcd.c | 13 ++++++++-----
>> 1 file changed, 8 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
>> index 190f95964000..c51b73b3e048 100644
>> --- a/drivers/usb/dwc2/hcd.c
>> +++ b/drivers/usb/dwc2/hcd.c
>> @@ -358,9 +358,14 @@ static void dwc2_gusbcfg_init(struct dwc2_hsotg *hsotg)
>>
>> static int dwc2_vbus_supply_init(struct dwc2_hsotg *hsotg)
>> {
>> + int ret;
>> +
>> hsotg->vbus_supply = devm_regulator_get_optional(hsotg->dev, "vbus");
>> - if (IS_ERR(hsotg->vbus_supply))
>> - return 0;
>> + if (IS_ERR(hsotg->vbus_supply)) {
>> + ret = PTR_ERR(hsotg->vbus_supply);
>> + hsotg->vbus_supply = NULL;
>> + return ret == -ENODEV ? 0 : ret;
>> + }
>>
>> return regulator_enable(hsotg->vbus_supply);
>> }
>> @@ -4342,9 +4347,7 @@ static int _dwc2_hcd_start(struct usb_hcd *hcd)
>>
>> spin_unlock_irqrestore(&hsotg->lock, flags);
>>
>> - dwc2_vbus_supply_init(hsotg);
>> -
>> - return 0;
>> + return dwc2_vbus_supply_init(hsotg);
>> }
>>
>> /*
>>
>
> Not able to apply patch. Please rebase to balbi/next

Are you sure? Just rebased and the resulting patch is identical to what
was sent.

Thanks,

Tomeu

\
 
 \ /
  Last update: 2018-04-05 10:11    [W:0.086 / U:0.660 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site