openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Felipe Balbi 2015-02-26 14:42:19 -06:00
parent 06753fe115
commit 0244336f81
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/musb/musb_core.c
View File

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