Skip to content

Commit

Permalink
usb: musb: PM: fix context save/restore in suspend/resume path
Browse files Browse the repository at this point in the history
Currently the driver tries to save context in the suspend path, but
will cause an abort if the device is already runtime suspended.  This
happens, for example, if MUSB loaded/compiled-in, in host mode, but no
USB devices are attached.  MUSB will be runtime suspended, but then
attempting a system suspend will crash due to the context save
being attempted while the device is disabled.

On OMAP, as of v3.1, the driver's ->runtime_suspend() callback will be
called late in the suspend path (by the PM domain layer) if the driver
is not already runtime suspended, ensuring a full shutdown.

Therefore, the context save is not needed in the ->suspend() method
since it will be called in the ->runtime_suspend() method anyways
(similarily for resume.)

NOTE: this leaves the suspend/resume methods basically empty (with
      some FIXMEs and comments, but I'll leave it to the maintainers
      to decide whether to remove them.

Cc: stable@vger.kernel.org
Signed-off-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Kevin Hilman authored and Greg Kroah-Hartman committed Nov 29, 2011
1 parent 118205d commit 5d193ce
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions 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 5d193ce

Please sign in to comment.