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: [v3] usb: dwc2: dwc2_vbus_supply_init: fix error check From: Heiko Stuebner Message-Id: <1794463.c121CNJ3R4@diego> Date: Thu, 22 Mar 2018 14:26:34 +0100 To: Tomeu Vizoso Cc: linux-kernel@vger.kernel.org, Felipe Balbi , Amelie Delaunay , Minas Harutyunyan , Greg Kroah-Hartman , linux-usb@vger.kernel.org List-ID: QW0gRG9ubmVyc3RhZywgMjIuIE3DpHJ6IDIwMTgsIDE0OjE0OjUxIENFVCBzY2hyaWViIFRvbWV1 IFZpem9zbzoKPiBkZXZtX3JlZ3VsYXRvcl9nZXRfb3B0aW9uYWwgcmV0dXJucyAtRU5PREVWIGlm IHRoZSByZWd1bGF0b3IgaXNuJ3QKPiB0aGVyZSwgc28gaWYgdGhhdCdzIHRoZSBjYXNlIHdlIGhh dmUgdG8gbWFrZSBzdXJlIG5vdCB0byBsZWF2ZSAtRU5PREVWCj4gaW4gdGhlIHJlZ3VsYXRvciBw b2ludGVyLgo+IAo+IEFsc28sIG1ha2Ugc3VyZSB3ZSByZXR1cm4gMCBpbiB0aGF0IGNhc2UsIGJ1 dCBjb3JyZWN0bHkgcHJvcGFnYXRlIGFueQo+IG90aGVyIGVycm9ycy4gQWxzbyBwcm9wYWdhdGUg dGhlIGVycm9yIGZyb20gX2R3YzJfaGNkX3N0YXJ0Lgo+IAo+IEZpeGVzOiA1MzFlZjVlYmVhOTYg KCJ1c2I6IGR3YzI6IGFkZCBzdXBwb3J0IGZvciBob3N0IG1vZGUgZXh0ZXJuYWwgdmJ1cwo+IHN1 cHBseSIpIENjOiBBbWVsaWUgRGVsYXVuYXkgPGFtZWxpZS5kZWxhdW5heUBzdC5jb20+Cj4gU2ln bmVkLW9mZi1ieTogVG9tZXUgVml6b3NvIDx0b21ldS52aXpvc29AY29sbGFib3JhLmNvbT4KPiAK PiAtLS0KPiAKPiB2MjogT25seSBvdmVyd3JpdGUgdGhlIGVycm9yIGluIHRoZSBwb2ludGVyIGFm dGVyIGNoZWNraW5nIGl0IChIZWlrbwo+ICAgICBTdMO8Ym5lciA8aGVpa29Ac250ZWNoLmRlPikK PiB2MzogUmVtb3ZlIGh1bmtzIHRoYXQgc2hvdWxkbid0IGJlIGluIHRoaXMgcGF0Y2gKPiAtLS0K PiAgZHJpdmVycy91c2IvZHdjMi9oY2QuYyB8IDExICsrKysrKystLS0tCj4gIDEgZmlsZSBjaGFu Z2VkLCA3IGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvdXNiL2R3YzIvaGNkLmMgYi9kcml2ZXJzL3VzYi9kd2MyL2hjZC5jCj4gaW5kZXggZGNm ZGE1ZWI0Y2FjLi44NjNhZWQyMDUxN2YgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy91c2IvZHdjMi9o Y2QuYwo+ICsrKyBiL2RyaXZlcnMvdXNiL2R3YzIvaGNkLmMKPiBAQCAtMzU5LDggKzM1OSwxMyBA QCBzdGF0aWMgdm9pZCBkd2MyX2d1c2JjZmdfaW5pdChzdHJ1Y3QgZHdjMl9oc290ZyAqaHNvdGcp Cj4gc3RhdGljIGludCBkd2MyX3ZidXNfc3VwcGx5X2luaXQoc3RydWN0IGR3YzJfaHNvdGcgKmhz b3RnKQo+ICB7Cj4gIAloc290Zy0+dmJ1c19zdXBwbHkgPSBkZXZtX3JlZ3VsYXRvcl9nZXRfb3B0 aW9uYWwoaHNvdGctPmRldiwgInZidXMiKTsKPiAtCWlmIChJU19FUlIoaHNvdGctPnZidXNfc3Vw cGx5KSkKPiArCWlmIChQVFJfRVJSKGhzb3RnLT52YnVzX3N1cHBseSkgPT0gLUVOT0RFVikgewo+ ICsJCWhzb3RnLT52YnVzX3N1cHBseSA9IE5VTEw7Cj4gIAkJcmV0dXJuIDA7Cj4gKwl9IGVsc2Ug aWYgKElTX0VSUihoc290Zy0+dmJ1c19zdXBwbHkpKSB7Cj4gKwkJaHNvdGctPnZidXNfc3VwcGx5 ID0gTlVMTDsKPiArCQlyZXR1cm4gUFRSX0VSUihoc290Zy0+dmJ1c19zdXBwbHkpOwo+ICsJfQoK bXkgcGVyc29uYWwgY2x1ZWxlc3NuZXMsIGJ1dCBjYW4geW91IHVzZSBQVFJfRVJSIHdpdGhvdXQg Y2hlY2tpbmcgZm9yCklTX0VSUiBmaXJzdD8KCkkgd291bGQndmUgZXhwZWN0ZWQgc29tZXRoaW5n IGFsb25nIHRoZSBsaW5lIG9mCgppZiAoSVNfRVJSKGhzb3RnLT52YnVzX3N1cHBseSkpIHsKCWlm IChQVFJfRVJSKGhzb3RnLT52YnVzX3N1cHBseSkgPT0gLUVOT0RFVikgewoJCWhzb3RnLT52YnVz X3N1cHBseSA9IE5VTEw7CgkJcmV0dXJuIDA7Cgl9IGVsc2UgewoJCXJldHVybiBQVFJfRVJSKGhz b3RnLT52YnVzX3N1cHBseSk7Cgl9Cn0KLS0tClRvIHVuc3Vic2NyaWJlIGZyb20gdGhpcyBsaXN0 OiBzZW5kIHRoZSBsaW5lICJ1bnN1YnNjcmliZSBsaW51eC11c2IiIGluCnRoZSBib2R5IG9mIGEg bWVzc2FnZSB0byBtYWpvcmRvbW9Admdlci5rZXJuZWwub3JnCk1vcmUgbWFqb3Jkb21vIGluZm8g YXQgIGh0dHA6Ly92Z2VyLmtlcm5lbC5vcmcvbWFqb3Jkb21vLWluZm8uaHRtbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-2776495-1521725220-2-13006549348851731194 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no 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='CN', FromHeader='de', MailFrom='org' X-Spam-charsets: from='ISO-8859-1', plain='iso-8859-1' 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=arctest; t=1521725219; b=tbKMlpAXEcWEiClJAb66G51ZfHb2kPZ5NH9CYfr0k+BpfsR 0NSh96yW35NKTqCvtTu3xup172AhxAEY/Xtsic0oySsxr7PA4Igh+tG2hj656a3j TERcKbZKPArj0FDqumQBXuqSyvJsyiNTx06G7ABOYhlYc4thjVodu+BdkxfK++O5 5874nYawNMKeGCfVN3eKgFZ8euVPpEMZV9BwU+/z1uFKAaUnGgzaXNP+tMFgHS/Z vE/RrnGKAelnF+w9xJ5PD48EVBqoeAjBWuV8WB8xMBXjjihquOc6vXfXGynD+g3Z kMLJNMUlBz8D1UpKM41VpMZ1HfNbe0QLmo6Ne9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding :content-type:sender:list-id; s=arctest; t=1521725219; bh=BcZCYb oO4hc4W4HaVYImz6fXOSsOs+vxIw8UjJYcHQo=; b=VJtwxPmVJWETgwWJ8iO3uD nvcRa3OG90WEaJUw7mp9AAcjxB1LH6BZj+9IcLR60r5a6bNY9VNi+MsFmldac8y6 MrhTvmjQ2ziwBeyk//07NrlLZrhLX+tjX6UJOdh68eg/ekkGEqRx4Cykqeb7GfTW 4Ph1JBPLvRCXJA0EcRmZpZoSGODfcFD94tr4c27VsqYmcKGJF8txR6VhCrPHdlWt mIHAqr9SibG3+oNlFoD1nhgVlQEmE+3X+tNu1tQohBcQfsk6Tmmjw3ISRXlcf+yx TKEwT2RZXB+rrxgcAENAKefNlrkLvP+w9zWRHuH+pFYRPhi3HST5bCvxJi2Wt1jA == ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=sntech.de; 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-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=sntech.de header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=sntech.de; 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-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=sntech.de header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752699AbeCVN0m convert rfc822-to-8bit (ORCPT ); Thu, 22 Mar 2018 09:26:42 -0400 Received: from gloria.sntech.de ([95.129.55.99]:57092 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750992AbeCVN0l (ORCPT ); Thu, 22 Mar 2018 09:26:41 -0400 From: Heiko =?ISO-8859-1?Q?St=FCbner?= To: Tomeu Vizoso Cc: linux-kernel@vger.kernel.org, Felipe Balbi , Amelie Delaunay , Minas Harutyunyan , Greg Kroah-Hartman , linux-usb@vger.kernel.org Subject: Re: [PATCH v3] usb: dwc2: dwc2_vbus_supply_init: fix error check Date: Thu, 22 Mar 2018 14:26:34 +0100 Message-ID: <1794463.c121CNJ3R4@diego> In-Reply-To: <20180322131451.12631-1-tomeu.vizoso@collabora.com> References: <20180322093943.49717-1-tomeu.vizoso@collabora.com> <20180322131451.12631-1-tomeu.vizoso@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT Content-Type: text/plain; charset="iso-8859-1" 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: Am Donnerstag, 22. März 2018, 14:14:51 CET schrieb Tomeu Vizoso: > 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 > --- > drivers/usb/dwc2/hcd.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c > index dcfda5eb4cac..863aed20517f 100644 > --- a/drivers/usb/dwc2/hcd.c > +++ b/drivers/usb/dwc2/hcd.c > @@ -359,8 +359,13 @@ static void dwc2_gusbcfg_init(struct dwc2_hsotg *hsotg) > static int dwc2_vbus_supply_init(struct dwc2_hsotg *hsotg) > { > hsotg->vbus_supply = devm_regulator_get_optional(hsotg->dev, "vbus"); > - if (IS_ERR(hsotg->vbus_supply)) > + if (PTR_ERR(hsotg->vbus_supply) == -ENODEV) { > + hsotg->vbus_supply = NULL; > return 0; > + } else if (IS_ERR(hsotg->vbus_supply)) { > + hsotg->vbus_supply = NULL; > + return PTR_ERR(hsotg->vbus_supply); > + } my personal cluelessnes, but can you use PTR_ERR without checking for IS_ERR first? I would've expected something along the line of if (IS_ERR(hsotg->vbus_supply)) { if (PTR_ERR(hsotg->vbus_supply) == -ENODEV) { hsotg->vbus_supply = NULL; return 0; } else { return PTR_ERR(hsotg->vbus_supply); } }