From patchwork Sat May 30 08:37:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 246872 List-Id: U-Boot discussion From: samuel at sholland.org (Samuel Holland) Date: Sat, 30 May 2020 03:37:34 -0500 Subject: [PATCH] usb: xhci-dwc3: Fix usage of bulk PHY API Message-ID: <20200530083734.29356-1-samuel@sholland.org> The PHY consumer is responsible for allocating the struct phy_bulk. During conversion to the bulk API, the contents of the struct were replaced by a pointer instead of the struct itself. This leads to a null pointer dereference in generic_phy_get_bulk() when setting bulk->phys. Fixes: 6dfb8a8052ee ("usb: dwc3: use the phy bulk API to get phys") Signed-off-by: Samuel Holland --- drivers/usb/host/xhci-dwc3.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c index 563db1a426..9b22f271a7 100644 --- a/drivers/usb/host/xhci-dwc3.c +++ b/drivers/usb/host/xhci-dwc3.c @@ -19,7 +19,7 @@ #include struct xhci_dwc3_platdata { - struct phy_bulk *usb_phys; + struct phy_bulk usb_phys; }; void dwc3_set_mode(struct dwc3 *dwc3_reg, u32 mode) @@ -124,7 +124,7 @@ static int xhci_dwc3_probe(struct udevice *dev) hcor = (struct xhci_hcor *)((uintptr_t)hccr + HC_LENGTH(xhci_readl(&(hccr)->cr_capbase))); - ret = dwc3_setup_phy(dev, plat->usb_phys); + ret = dwc3_setup_phy(dev, &plat->usb_phys); if (ret && (ret != -ENOTSUPP)) return ret; @@ -167,7 +167,7 @@ static int xhci_dwc3_remove(struct udevice *dev) { struct xhci_dwc3_platdata *plat = dev_get_platdata(dev); - dwc3_shutdown_phy(dev, plat->usb_phys); + dwc3_shutdown_phy(dev, &plat->usb_phys); return xhci_deregister(dev); }