diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 08a69f4f4d5a..a86d238a8072 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -741,6 +741,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
 					+ msecs_to_jiffies(musb->a_wait_bcon));
 			break;
 		case OTG_STATE_A_HOST:
+			dev_err(musb->controller, "got SUSPEND intr with A_HOST state\n");
 			musb->xceiv->otg->state = OTG_STATE_A_SUSPEND;
 			musb->is_active = musb->hcd->self.b_hnp_enable;
 			break;
@@ -1586,9 +1587,10 @@ irqreturn_t musb_interrupt(struct musb *musb)
 
 	devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
 
-	dev_dbg(musb->controller, "** IRQ %s usb%04x tx%04x rx%04x\n",
-		is_host_active(musb) ? "host" : "peripheral",
-		musb->int_usb, musb->int_tx, musb->int_rx);
+	if (musb->int_usb)
+		dev_err(musb->controller, "** IRQ %s usb%04x\n",
+			is_host_active(musb) ? "host" : "peripheral",
+			musb->int_usb);
 
 	/**
 	 * According to Mentor Graphics' documentation, flowchart on page 98,
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 4c481cd66c77..f570a5c24a1b 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -2011,6 +2011,7 @@ void musb_g_disconnect(struct musb *musb)
 		MUSB_HST_MODE(musb);
 		break;
 	case OTG_STATE_A_PERIPHERAL:
+		dev_err(musb->controller, "g_disconnect with A_PERI state\n");
 		musb->xceiv->otg->state = OTG_STATE_A_WAIT_BCON;
 		MUSB_HST_MODE(musb);
 		break;
@@ -2087,6 +2088,7 @@ __acquires(musb->lock)
 		musb->xceiv->otg->state = OTG_STATE_B_PERIPHERAL;
 		musb->g.is_a_peripheral = 0;
 	} else {
+		dev_err(musb->controller, "g_reset, devctl 0x%02x\n", devctl);
 		musb->xceiv->otg->state = OTG_STATE_A_PERIPHERAL;
 		musb->g.is_a_peripheral = 1;
 	}
diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c
index 4731baca377f..6501cb6fa275 100644
--- a/drivers/usb/musb/musb_virthub.c
+++ b/drivers/usb/musb/musb_virthub.c
@@ -227,6 +227,7 @@ void musb_root_disconnect(struct musb *musb)
 	switch (musb->xceiv->otg->state) {
 	case OTG_STATE_A_SUSPEND:
 		if (otg->host->b_hnp_enable) {
+			dev_err(musb->controller, "root_disconnect with A_SUSPEND state\n");
 			musb->xceiv->otg->state = OTG_STATE_A_PERIPHERAL;
 			musb->g.is_a_peripheral = 1;
 			break;