Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 164996
b: refs/heads/master
c: c740d0d
h: refs/heads/master
v: v3
  • Loading branch information
Ajay Kumar Gupta authored and Greg Kroah-Hartman committed Sep 23, 2009
1 parent 21f6c54 commit 962b34b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: db8be50c4307dac2b37305fc59c8dc0f978d09ea
refs/heads/master: c740d0d80d385b178c319f3d6e627ade8f732488
8 changes: 4 additions & 4 deletions trunk/drivers/usb/musb/musb_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1850,6 +1850,10 @@ static void musb_free(struct musb *musb)
dma_controller_destroy(c);
}

#ifdef CONFIG_USB_MUSB_OTG
put_device(musb->xceiv->dev);
#endif

musb_writeb(musb->mregs, MUSB_DEVCTL, 0);
musb_platform_exit(musb);
musb_writeb(musb->mregs, MUSB_DEVCTL, 0);
Expand All @@ -1859,10 +1863,6 @@ static void musb_free(struct musb *musb)
clk_put(musb->clock);
}

#ifdef CONFIG_USB_MUSB_OTG
put_device(musb->xceiv->dev);
#endif

#ifdef CONFIG_USB_MUSB_HDRC_HCD
usb_put_hcd(musb_to_hcd(musb));
#else
Expand Down

0 comments on commit 962b34b

Please sign in to comment.