diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-10-19 16:31:14 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-10-19 16:31:14 -0400 |
| commit | 20c87bd40e6c1ff7e31cc5eea4fb37829a57eb58 (patch) | |
| tree | 528c2f113e428e060e185ccab7eab8d8e87c7d36 /drivers/usb/host/xhci-mem.c | |
| parent | d14df339c72b6efbba4eddd1d1f3f4b173273f74 (diff) | |
| parent | 40f8989695660dee984338861ca9900b8e0b5183 (diff) | |
Merge tag 'asoc-v3.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.12
A number of small, fairly unexciting, fixes for drivers - nothing stand
out.
Diffstat (limited to 'drivers/usb/host/xhci-mem.c')
| -rw-r--r-- | drivers/usb/host/xhci-mem.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index 53b972c2a09f..83bcd13622c3 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c | |||
| @@ -2428,6 +2428,8 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) | |||
| 2428 | for (i = 0; i < USB_MAXCHILDREN; ++i) { | 2428 | for (i = 0; i < USB_MAXCHILDREN; ++i) { |
| 2429 | xhci->bus_state[0].resume_done[i] = 0; | 2429 | xhci->bus_state[0].resume_done[i] = 0; |
| 2430 | xhci->bus_state[1].resume_done[i] = 0; | 2430 | xhci->bus_state[1].resume_done[i] = 0; |
| 2431 | /* Only the USB 2.0 completions will ever be used. */ | ||
| 2432 | init_completion(&xhci->bus_state[1].rexit_done[i]); | ||
| 2431 | } | 2433 | } |
| 2432 | 2434 | ||
| 2433 | if (scratchpad_alloc(xhci, flags)) | 2435 | if (scratchpad_alloc(xhci, flags)) |