diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-08 08:26:51 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-08 08:26:51 -0700 |
| commit | e3fa252a0ef3d1f93bc55cefc2f707359b43c70d (patch) | |
| tree | 03dd106086b09479ade278273d9c1db2445b801d /drivers/usb/gadget | |
| parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) | |
| parent | a2457ee691edeffb511dbff9a69008f480192197 (diff) | |
Merge 3.2-rc1 into usb-linus
This is needed to catch the resume bug that was bothering lots of us from
testing some XHCI bug fixes in the suspend/resume path.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/gadget')
| -rw-r--r-- | drivers/usb/gadget/inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c index 8793f32bab1..e58b1644297 100644 --- a/drivers/usb/gadget/inode.c +++ b/drivers/usb/gadget/inode.c @@ -1574,7 +1574,6 @@ static void destroy_ep_files (struct dev_data *dev) DBG (dev, "%s %d\n", __func__, dev->state); /* dev->state must prevent interference */ -restart: spin_lock_irq (&dev->lock); while (!list_empty(&dev->epfiles)) { struct ep_data *ep; |