Skip to contentSkip to conversation

patch "usb: gadget: udc: renesas_usb3: should fail if devm_phy_get() returns" added to usb-next

PATCH [email protected] 1 participant 1 message May 24, 2018

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

usb: gadget: udc: renesas_usb3: should fail if devm_phy_get() returns

to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-next branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will also be merged in the next major kernel release during the merge window.

If you have any questions about this process, please let me know.

Quoted 1 line

From 0259068f63f23a665ded28647f2f9cdb6b20dc72 Mon Sep 17 00:00:00 2001

From: Yoshihiro Shimoda <[email protected]>
Date: Tue, 10 Apr 2018 14:38:53 +0900
Subject: usb: gadget: udc: renesas_usb3: should fail if devm_phy_get() returns
error

This patch fixes an issue that this driver ignores errors other than the non-existence of the device, f.e. a memory allocation failure in devm_phy_get(). So, this patch replaces devm_phy_get() with devm_phy_optional_get().

Fixes 279d4bc64060 ("usb: gadget: udc: renesas_usb3: add support for generic phy")
Cc <[email protected]> # v4.15+
---
 drivers/usb/gadget/udc/renesas_usb3.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/usb/gadget/udc/renesas_usb3.c +5 -3
index 61b72edab7ab..5d5a5d9e3669 100644
@@ -2638,9 +2638,11 @@ static int renesas_usb3_probe(struct platform_device *pdev)
 	 * This is optional. So, if this driver cannot get a phy,
 	 * this driver will not handle a phy anymore.
 	 */
-	usb3->phy = devm_phy_get(&pdev->dev, "usb");
-	if (IS_ERR(usb3->phy))
-		usb3->phy = NULL;
+	usb3->phy = devm_phy_optional_get(&pdev->dev, "usb");
+	if (IS_ERR(usb3->phy)) {
+		ret = PTR_ERR(usb3->phy);
+		goto err_add_udc;
+	}
 
 	pm_runtime_enable(&pdev->dev);
 	ret = usb_add_gadget_udc(&pdev->dev, &usb3->gadget);
Signature · 1 line
2.17.0