mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
|
From c1f136b47efcee25db531427e8e74529ce5462bb Mon Sep 17 00:00:00 2001
|
||
|
From: Dom Cobley <popcornmix@gmail.com>
|
||
|
Date: Wed, 27 Mar 2024 19:02:13 +0000
|
||
|
Subject: [PATCH 0999/1002] Revert "Revert "usb: phy: generic: Get the vbus
|
||
|
supply""
|
||
|
|
||
|
This reverts commit c30a72d0e0ca9ccb058b63a7a273c75b04a5b6a7.
|
||
|
---
|
||
|
drivers/usb/phy/phy-generic.c | 7 +++++++
|
||
|
1 file changed, 7 insertions(+)
|
||
|
|
||
|
diff --git a/drivers/usb/phy/phy-generic.c b/drivers/usb/phy/phy-generic.c
|
||
|
index c4b3f2484dc0..770081b828a4 100644
|
||
|
--- a/drivers/usb/phy/phy-generic.c
|
||
|
+++ b/drivers/usb/phy/phy-generic.c
|
||
|
@@ -261,6 +261,13 @@ int usb_phy_gen_create_phy(struct device *dev, struct usb_phy_generic *nop)
|
||
|
return dev_err_probe(dev, PTR_ERR(nop->vcc),
|
||
|
"could not get vcc regulator\n");
|
||
|
|
||
|
+ nop->vbus_draw = devm_regulator_get_exclusive(dev, "vbus");
|
||
|
+ if (PTR_ERR(nop->vbus_draw) == -ENODEV)
|
||
|
+ nop->vbus_draw = NULL;
|
||
|
+ if (IS_ERR(nop->vbus_draw))
|
||
|
+ return dev_err_probe(dev, PTR_ERR(nop->vbus_draw),
|
||
|
+ "could not get vbus regulator\n");
|
||
|
+
|
||
|
nop->dev = dev;
|
||
|
nop->phy.dev = nop->dev;
|
||
|
nop->phy.label = "nop-xceiv";
|
||
|
--
|
||
|
2.44.0
|
||
|
|