浏览代码

usb: musb: core: disable irqs inside babble recovery

There's no point is splitting those anymore.

We're now also able to drop another forward
declaration.

Tested-by: Bin Liu <b-liu@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Felipe Balbi 10 年之前
父节点
当前提交
0244336f81
共有 1 个文件被更改,包括 3 次插入4 次删除
  1. 3 4
      drivers/usb/musb/musb_core.c

+ 3 - 4
drivers/usb/musb/musb_core.c

@@ -507,7 +507,6 @@ void musb_hnp_stop(struct musb *musb)
 	musb->port1_status &= ~(USB_PORT_STAT_C_CONNECTION << 16);
 }
 
-static void musb_disable_interrupts(struct musb *musb);
 static void musb_recover_from_babble(struct musb *musb);
 
 /*
@@ -883,10 +882,8 @@ b_host:
 			if (power & MUSB_POWER_HSMODE) {
 				dev_err(musb->controller, "Babble\n");
 
-				if (is_host_active(musb)) {
-					musb_disable_interrupts(musb);
+				if (is_host_active(musb))
 					musb_recover_from_babble(musb);
-				}
 			}
 		} else {
 			dev_dbg(musb->controller, "BUS RESET as %s\n",
@@ -1835,6 +1832,8 @@ static void musb_recover_from_babble(struct musb *musb)
 	int ret;
 	u8 devctl;
 
+	musb_disable_interrupts(musb);
+
 	/*
 	 * wait at least 320 cycles of 60MHz clock. That's 5.3us, we will give
 	 * it some slack and wait for 10us.