diff options
| -rw-r--r-- | drivers/usb/gadget/composite.c | 4 | ||||
| -rw-r--r-- | drivers/usb/gadget/f_mass_storage.c | 4 | ||||
| -rw-r--r-- | drivers/usb/musb-new/musb_core.c | 4 | ||||
| -rw-r--r-- | drivers/usb/musb-new/musb_gadget_ep0.c | 2 |
4 files changed, 13 insertions, 1 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index c98a444245..4a6f4271d5 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -1003,7 +1003,11 @@ static void composite_unbind(struct usb_gadget *gadget) * so there's no i/o concurrency that could affect the * state protected by cdev->lock. */ +#ifdef __UBOOT__ + assert_noisy(!cdev->config); +#else BUG_ON(cdev->config); +#endif while (!list_empty(&cdev->configs)) { c = list_first_entry(&cdev->configs, diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index 45c7b58eed..c1e6506659 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -390,7 +390,11 @@ static inline int __fsg_is_set(struct fsg_common *common, if (common->fsg) return 1; ERROR(common, "common->fsg is NULL in %s at %u\n", func, line); +#ifdef __UBOOT__ + assert_noisy(false); +#else WARN_ON(1); +#endif return 0; } diff --git a/drivers/usb/musb-new/musb_core.c b/drivers/usb/musb-new/musb_core.c index afea9fbcef..ab5e3aa9d1 100644 --- a/drivers/usb/musb-new/musb_core.c +++ b/drivers/usb/musb-new/musb_core.c @@ -1859,7 +1859,11 @@ allocate_instance(struct device *dev, musb->ctrl_base = mbase; musb->nIrq = -ENODEV; musb->config = config; +#ifdef __UBOOT__ + assert_noisy(musb->config->num_eps <= MUSB_C_NUM_EPS); +#else BUG_ON(musb->config->num_eps > MUSB_C_NUM_EPS); +#endif for (epnum = 0, ep = musb->endpoints; epnum < musb->config->num_eps; epnum++, ep++) { diff --git a/drivers/usb/musb-new/musb_gadget_ep0.c b/drivers/usb/musb-new/musb_gadget_ep0.c index 9835a2e2bf..3ef8fe1373 100644 --- a/drivers/usb/musb-new/musb_gadget_ep0.c +++ b/drivers/usb/musb-new/musb_gadget_ep0.c @@ -882,7 +882,7 @@ finish: default: /* "can't happen" */ - WARN_ON(1); + assert_noisy(false); musb_writew(regs, MUSB_CSR0, MUSB_CSR0_P_SENDSTALL); musb->ep0_state = MUSB_EP0_STAGE_IDLE; break; |