Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 276332
b: refs/heads/master
c: 5d193ce
h: refs/heads/master
v: v3
  • Loading branch information
Kevin Hilman authored and Greg Kroah-Hartman committed Nov 29, 2011
1 parent caeb391 commit d44f1e7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 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: 118205d6b6752e22e19b771771174e6426582311
refs/heads/master: 5d193ce8f1fa7c67c7fd7be2c03ef31eed344a4f
6 changes: 0 additions & 6 deletions trunk/drivers/usb/musb/musb_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2301,18 +2301,12 @@ static int musb_suspend(struct device *dev)
*/
}

musb_save_context(musb);

spin_unlock_irqrestore(&musb->lock, flags);
return 0;
}

static int musb_resume_noirq(struct device *dev)
{
struct musb *musb = dev_to_musb(dev);

musb_restore_context(musb);

/* for static cmos like DaVinci, register values were preserved
* unless for some reason the whole soc powered down or the USB
* module got reset through the PSC (vs just being disabled).
Expand Down

0 comments on commit d44f1e7

Please sign in to comment.