Commit 9adaa039 authored by Derald D. Woods's avatar Derald D. Woods Committed by Tom Rini

usb: musb-new: omap2430: Fix compilation warning with USB_MUSB_GADGET

This commit addresses the following warning, when _NOT_ USB_MUSB_HOST:

  CC      drivers/usb/gadget/f_mass_storage.o
  CC      drivers/usb/musb-new/omap2430.o
  CC      drivers/usb/gadget/f_fastboot.o
  CC      env/common.o
  CC      env/env.o
/src/etinker/software/u-boot-master/drivers/usb/musb-new/omap2430.c: In function ‘omap2430_musb_probe’:
/src/etinker/software/u-boot-master/drivers/usb/musb-new/omap2430.c:239:6: warning: assignment to ‘int’ from ‘struct musb *’ makes integer from pointer without a cast [-Wint-conversion]
  ret = musb_register(&platdata->plat,
  LD      drivers/usb/host/built-in.o
  CC      drivers/usb/gadget/f_sdp.o
  CC      fs/ext4/ext4fs.o
Signed-off-by: default avatarDerald D. Woods <>
parent e74e9f62
......@@ -215,11 +215,13 @@ static int omap2430_musb_probe(struct udevice *dev)
struct musb_host_data *host = dev_get_priv(dev);
struct musb *musbp;
struct omap2430_musb_platdata *platdata = dev_get_platdata(dev);
struct usb_bus_priv *priv = dev_get_uclass_priv(dev);
struct omap_musb_board_data *otg_board_data;
int ret;
int ret = 0;
void *base = dev_read_addr_ptr(dev);
priv->desc_before_addr = true;
......@@ -236,9 +238,11 @@ static int omap2430_musb_probe(struct udevice *dev)
ret = musb_lowlevel_init(host);
ret = musb_register(&platdata->plat,
musbp = musb_register(&platdata->plat,
(struct device *)otg_board_data,
if (IS_ERR_OR_NULL(musbp))
return -EINVAL;
return ret;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment