From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-2456290-1522921934-2-18284547861729455107 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no ("Email failed DMARC policy for domain") X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='UNK' X-Spam-charsets: plain='iso-8859-1' X-IgnoreVacation: yes ("Email failed DMARC policy for domain") X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: linux-usb-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1522921933; b=etJpQ9ahgD5O0l4BM4hZhrRk67mADZUgJRO+/7P2eecsnCJKYg OT/MykSBjKv+ropzfxSjLgx4luhUU0Ky/gJvs1u1F3/2rq4iy8xKxrJ4JB3U2a8p IG8IrGocRbEyOYw1jLpxL9pL2Zd6/B76S43+4bHeNpYzy1SEii7T0r+cjmjf+mPY 3sI3vYcu/bglm+3OcSpLD8Lydblp0Np4tSarT8YOlVml2ftGfKrp29PuuWoMsuPm n7QngHJAskpi6nqwqh++1DKGEM9fxzXaZEFjaOsbAPiilmUH5ihd5VCq8+ZrPgkK UAAmSkafMXjtnwc1ys7XKTx1nR84vCZUcloQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:content-type:content-transfer-encoding:mime-version :sender:list-id; s=fm2; t=1522921933; bh=IrbtlGyujLnirE5fnDLQd1E TMQttnK38XYx6f+tzNxo=; b=PYa39VpnR77ENT+9sOznGWDGBaTyP2Oxu30xbHO cgve6YoScxEZXaZhoVaPs9LXF0mFXX9OcsIF4RmXeaFhv/VMeBflHFjgiJ48cp91 AFtPkgQFE6E4ryyvtoS3bGLt/1kqUWvYPxYABxwHsd0K8zbQMR2IuZi0uDRJy0Uw KUj9MpjSYTsuEt0SiO6iJnBBD0dBzsq4Qgx1h8tC0IStjTEL8gffKcVLaao/k2YV IE9j98KRs90nYhOqlg85V/A6KSHmnhNTJr+CwuLkUX+/FZiyuL3a0u/jmVGVisLU p89J/YvxzV3Us1JHVjZPvrGz4sSYsX5XDKPTXn1FS2mSvyQ== ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=fail (p=none,has-list-id=yes,d=none) header.from=synopsys.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=linux-usb-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=synopsys.com header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx4.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=fail (p=none,has-list-id=yes,d=none) header.from=synopsys.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=linux-usb-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=synopsys.com header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfHpWlWCIbD9FJkFJt9koOKQBHcvOZsMSHmY5+4qfd0meWQ8mHK8TRfvpHq3ETmbrJYx9OB2XVpcIIveiWGr+98givCCw9L7wQBqSohG8u2rKz81i27kb 12UQ22qx5UadPJpr06VqBEiRx0RZHOXL0+43RBmQ8gWHG9/i80AEGu2YZI0TdvWcYQ9M7E90BUPCj1clNksVfJJ3vQ/UK9r5F8qi+i7dKY4MT3on1Lq+ILQs X-CM-Analysis: v=2.3 cv=JLoVTfCb c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=NMaeLcIL3LwA:10 a=8nJEP1OIZ-IA:10 a=xqWC_Br6kY4A:10 a=Kd1tUaAdevIA:10 a=8b9GpE9nAAAA:8 a=QX4gbG5DAAAA:8 a=QyXUC8HyAAAA:8 a=jIQo8A4GAAAA:8 a=VwQbUJbxAAAA:8 a=laAAZDdOv0Ib19R1wGcA:9 a=wPNLvfGTeEIA:10 a=x8gzFH9gYPwA:10 a=T3LWEMljR5ZiDmsYVIUa:22 a=AbAUZ8qAyYyZVLSsDulk:22 a=Lf5xNeLK5dgiOs8hzIjU:22 a=AjGcO6oz07-iQ99wixmX:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752442AbeDEJvj convert rfc822-to-8bit (ORCPT ); Thu, 5 Apr 2018 05:51:39 -0400 Received: from smtprelay.synopsys.com ([198.182.60.111]:43485 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752423AbeDEJvg (ORCPT ); Thu, 5 Apr 2018 05:51:36 -0400 From: Minas Harutyunyan To: Grigor Tovmasyan , Tomeu Vizoso , "linux-kernel@vger.kernel.org" CC: Felipe Balbi , Heiko Stuebner , Amelie Delaunay , "Minas Harutyunyan" , Greg Kroah-Hartman , "linux-usb@vger.kernel.org" Subject: Re: [PATCH v4] usb: dwc2: dwc2_vbus_supply_init: fix error check Thread-Topic: [PATCH v4] usb: dwc2: dwc2_vbus_supply_init: fix error check Thread-Index: AQHTxOD8nEoVzOZ04EOGN7z3QZ1Kzw== Date: Thu, 5 Apr 2018 09:51:31 +0000 Message-ID: <410670D7E743164D87FA6160E7907A560113AE54A5@am04wembxb.internal.synopsys.com> References: <20180322093943.49717-1-tomeu.vizoso@collabora.com> <20180326090001.57627-1-tomeu.vizoso@collabora.com> <32EB88BF8EC1614E9FB18BD3718BE1A116412614@am04wembxb.internal.synopsys.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.116.70.63] Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-usb-owner@vger.kernel.org X-Mailing-List: linux-usb@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: On 4/5/2018 12:59 PM, Grigor Tovmasyan wrote: > 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 >> Signed-off-by: Tomeu Vizoso >> >> --- >> >> v2: Only overwrite the error in the pointer after checking it (Heiko >> Stübner ) >> v3: Remove hunks that shouldn't be in this patch >> v4: Don't overwrite the error code before returning it (kbuild test >> robot ) >> --- >> 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); >> } >> >> /* >> > > Reviewed-by: Grigor Tovmasyan > Acked-by: Minas Harutyunyan From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v4] usb: dwc2: dwc2_vbus_supply_init: fix error check From: Minas Harutyunyan Message-Id: <410670D7E743164D87FA6160E7907A560113AE54A5@am04wembxb.internal.synopsys.com> Date: Thu, 5 Apr 2018 09:51:31 +0000 To: Grigor Tovmasyan , Tomeu Vizoso , "linux-kernel@vger.kernel.org" Cc: Felipe Balbi , Heiko Stuebner , Amelie Delaunay , Minas Harutyunyan , Greg Kroah-Hartman , "linux-usb@vger.kernel.org" List-ID: T24gNC81LzIwMTggMTI6NTkgUE0sIEdyaWdvciBUb3ZtYXN5YW4gd3JvdGU6Cj4gT24gMy8yNi8y MDE4IDE6MDEgUE0sIFRvbWV1IFZpem9zbyB3cm90ZToKPj4gZGV2bV9yZWd1bGF0b3JfZ2V0X29w dGlvbmFsIHJldHVybnMgLUVOT0RFViBpZiB0aGUgcmVndWxhdG9yIGlzbid0Cj4+IHRoZXJlLCBz byBpZiB0aGF0J3MgdGhlIGNhc2Ugd2UgaGF2ZSB0byBtYWtlIHN1cmUgbm90IHRvIGxlYXZlIC1F Tk9ERVYKPj4gaW4gdGhlIHJlZ3VsYXRvciBwb2ludGVyLgo+Pgo+PiBBbHNvLCBtYWtlIHN1cmUg d2UgcmV0dXJuIDAgaW4gdGhhdCBjYXNlLCBidXQgY29ycmVjdGx5IHByb3BhZ2F0ZSBhbnkKPj4g b3RoZXIgZXJyb3JzLiBBbHNvIHByb3BhZ2F0ZSB0aGUgZXJyb3IgZnJvbSBfZHdjMl9oY2Rfc3Rh cnQuCj4+Cj4+IEZpeGVzOiA1MzFlZjVlYmVhOTYgKCJ1c2I6IGR3YzI6IGFkZCBzdXBwb3J0IGZv ciBob3N0IG1vZGUgZXh0ZXJuYWwgdmJ1cyBzdXBwbHkiKQo+PiBDYzogQW1lbGllIERlbGF1bmF5 IDxhbWVsaWUuZGVsYXVuYXlAc3QuY29tPgo+PiBTaWduZWQtb2ZmLWJ5OiBUb21ldSBWaXpvc28g PHRvbWV1LnZpem9zb0Bjb2xsYWJvcmEuY29tPgo+Pgo+PiAtLS0KPj4KPj4gdjI6IE9ubHkgb3Zl cndyaXRlIHRoZSBlcnJvciBpbiB0aGUgcG9pbnRlciBhZnRlciBjaGVja2luZyBpdCAoSGVpa28K Pj4gICAgICAgU3TDvGJuZXIgPGhlaWtvQHNudGVjaC5kZT4pCj4+IHYzOiBSZW1vdmUgaHVua3Mg dGhhdCBzaG91bGRuJ3QgYmUgaW4gdGhpcyBwYXRjaAo+PiB2NDogRG9uJ3Qgb3ZlcndyaXRlIHRo ZSBlcnJvciBjb2RlIGJlZm9yZSByZXR1cm5pbmcgaXQgKGtidWlsZCB0ZXN0Cj4+ICAgICAgIHJv Ym90IDxsa3BAaW50ZWwuY29tPikKPj4gLS0tCj4+ICAgIGRyaXZlcnMvdXNiL2R3YzIvaGNkLmMg fCAxMyArKysrKysrKy0tLS0tCj4+ICAgIDEgZmlsZSBjaGFuZ2VkLCA4IGluc2VydGlvbnMoKyks IDUgZGVsZXRpb25zKC0pCj4+Cj4+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9kd2MyL2hjZC5j IGIvZHJpdmVycy91c2IvZHdjMi9oY2QuYwo+PiBpbmRleCAxOTBmOTU5NjQwMDAuLmM1MWI3M2Iz ZTA0OCAxMDA2NDQKPj4gLS0tIGEvZHJpdmVycy91c2IvZHdjMi9oY2QuYwo+PiArKysgYi9kcml2 ZXJzL3VzYi9kd2MyL2hjZC5jCj4+IEBAIC0zNTgsOSArMzU4LDE0IEBAIHN0YXRpYyB2b2lkIGR3 YzJfZ3VzYmNmZ19pbml0KHN0cnVjdCBkd2MyX2hzb3RnICpoc290ZykKPj4gICAgCj4+ICAgIHN0 YXRpYyBpbnQgZHdjMl92YnVzX3N1cHBseV9pbml0KHN0cnVjdCBkd2MyX2hzb3RnICpoc290ZykK Pj4gICAgewo+PiArCWludCByZXQ7Cj4+ICsKPj4gICAgCWhzb3RnLT52YnVzX3N1cHBseSA9IGRl dm1fcmVndWxhdG9yX2dldF9vcHRpb25hbChoc290Zy0+ZGV2LCAidmJ1cyIpOwo+PiAtCWlmIChJ U19FUlIoaHNvdGctPnZidXNfc3VwcGx5KSkKPj4gLQkJcmV0dXJuIDA7Cj4+ICsJaWYgKElTX0VS Uihoc290Zy0+dmJ1c19zdXBwbHkpKSB7Cj4+ICsJCXJldCA9IFBUUl9FUlIoaHNvdGctPnZidXNf c3VwcGx5KTsKPj4gKwkJaHNvdGctPnZidXNfc3VwcGx5ID0gTlVMTDsKPj4gKwkJcmV0dXJuIHJl dCA9PSAtRU5PREVWID8gMCA6IHJldDsKPj4gKwl9Cj4+ICAgIAo+PiAgICAJcmV0dXJuIHJlZ3Vs YXRvcl9lbmFibGUoaHNvdGctPnZidXNfc3VwcGx5KTsKPj4gICAgfQo+PiBAQCAtNDM0Miw5ICs0 MzQ3LDcgQEAgc3RhdGljIGludCBfZHdjMl9oY2Rfc3RhcnQoc3RydWN0IHVzYl9oY2QgKmhjZCkK Pj4gICAgCj4+ICAgIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZoc290Zy0+bG9jaywgZmxhZ3Mp Owo+PiAgICAKPj4gLQlkd2MyX3ZidXNfc3VwcGx5X2luaXQoaHNvdGcpOwo+PiAtCj4+IC0JcmV0 dXJuIDA7Cj4+ICsJcmV0dXJuIGR3YzJfdmJ1c19zdXBwbHlfaW5pdChoc290Zyk7Cj4+ICAgIH0K Pj4gICAgCj4+ICAgIC8qCj4+Cj4gCj4gUmV2aWV3ZWQtYnk6IEdyaWdvciBUb3ZtYXN5YW4gPHRv dm1hc3lhQHN5bm9wc3lzLmNvbT4KPiAKCkFja2VkLWJ5OiBNaW5hcyBIYXJ1dHl1bnlhbiA8aG1p bmFzQHN5bm9wc3lzLmNvbT4KLS0tClRvIHVuc3Vic2NyaWJlIGZyb20gdGhpcyBsaXN0OiBzZW5k IHRoZSBsaW5lICJ1bnN1YnNjcmliZSBsaW51eC11c2IiIGluCnRoZSBib2R5IG9mIGEgbWVzc2Fn ZSB0byBtYWpvcmRvbW9Admdlci5rZXJuZWwub3JnCk1vcmUgbWFqb3Jkb21vIGluZm8gYXQgIGh0 dHA6Ly92Z2VyLmtlcm5lbC5vcmcvbWFqb3Jkb21vLWluZm8uaHRtbAo=