diff options
| author | Greg Kroah-Hartman | 2013-01-25 18:09:46 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-01-25 18:09:46 +0100 |
| commit | 4811f53fada7f2c6616229cc410e79362818a613 (patch) | |
| tree | 7087507a15fe828ce80576a357a2a2d40c1ae191 /drivers/usb/otg/mv_otg.c | |
| parent | Merge tag 'gadget-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | usb: dwc3: core: add dt support for dwc3 core (diff) | |
| download | kernel-qcow2-linux-4811f53fada7f2c6616229cc410e79362818a613.tar.gz kernel-qcow2-linux-4811f53fada7f2c6616229cc410e79362818a613.tar.xz kernel-qcow2-linux-4811f53fada7f2c6616229cc410e79362818a613.zip | |
Merge tag 'xceiv-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
Felipe writes:
usb: xceiv: patches for v3.9 merge window
Two new PHY drivers coming here: one for Samsung,
one for OMAP. Both architectures are adding USB3
support to mainline kernel.
The PHY layer now allows us to have mulitple PHYs
of the same type, which is necessary for platforms
which provide more than one USB peripheral port.
There's also a few cleanups here: removal of __dev*
annotations, conversion of a cast to to_delayed_work(),
and mxs-phy learns about ->set_suspend.
Diffstat (limited to 'drivers/usb/otg/mv_otg.c')
| -rw-r--r-- | drivers/usb/otg/mv_otg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/otg/mv_otg.c b/drivers/usb/otg/mv_otg.c index da2d60c06f15..b6a9be31133b 100644 --- a/drivers/usb/otg/mv_otg.c +++ b/drivers/usb/otg/mv_otg.c @@ -420,7 +420,7 @@ static void mv_otg_work(struct work_struct *work) struct usb_otg *otg; int old_state; - mvotg = container_of((struct delayed_work *)work, struct mv_otg, work); + mvotg = container_of(to_delayed_work(work), struct mv_otg, work); run: /* work queue is single thread, or we need spin_lock to protect */ |