Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-13 15:03:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

musb-new: omap2430: no host data access in gadget mode

Browse Source 
Avoid accessing structures (usb_bus_priv) only present when musb is
in host mode.

Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
This commit is contained in:
Andreas Kemnade
2023-01-09 08:13:30 +01:00
committed by Tom Rini
parent 448e2b6327
commit 7a2d80efc3
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/usb/musb-new/omap2430.c
View File

@@ -214,37 +214,35 @@ static int omap2430_musb_of_to_plat(struct udevice *dev)
static int omap2430_musb_probe(struct udevice *dev)
{
#ifdef CONFIG_USB_MUSB_HOST
struct musb_host_data *host = dev_get_priv(dev);
#else
struct musb *musbp;
#endif
struct omap2430_musb_plat *plat = dev_get_plat(dev);
struct usb_bus_priv *priv = dev_get_uclass_priv(dev);
struct omap_musb_board_data *otg_board_data;
int ret = 0;
void *base = dev_read_addr_ptr(dev);
priv->desc_before_addr = true;
struct musb *musbp;
otg_board_data = &plat->otg_board_data;
#ifdef CONFIG_USB_MUSB_HOST
host->host = musb_init_controller(&plat->plat,
(struct device *)otg_board_data,
plat->base);
if (!host->host) {
return -EIO;
if (CONFIG_IS_ENABLED(USB_MUSB_HOST)) {
struct musb_host_data *host = dev_get_priv(dev);
struct usb_bus_priv *priv = dev_get_uclass_priv(dev);
priv->desc_before_addr = true;
host->host = musb_init_controller(&plat->plat,
(struct device *)otg_board_data,
plat->base);
if (!host->host)
return -EIO;
return musb_lowlevel_init(host);
}
ret = musb_lowlevel_init(host);
#else
musbp = musb_register(&plat->plat, (struct device *)otg_board_data,
plat->base);
if (IS_ERR_OR_NULL(musbp))
return -EINVAL;
#endif
return ret;
return 0;
}
static int omap2430_musb_remove(struct udevice *dev)