aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorSarah Sharp <sarah.a.sharp@linux.intel.com>2009-11-04 14:22:19 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-11-17 19:46:34 -0500
commit5294bea40666db5c5d6c336b8e4e55d69fa576ca (patch)
treeeb2bcd2cc90b9318d8f61e389918b0479945d822 /drivers/usb
parent2fa88daa6f299bfb83672c3b525d786ad03b4735 (diff)
USB: xhci: Fix scratchpad deallocation.
The scratchpad_free() function uses xhci->page_size to free some memory with pci_free_consistent(). However, the page_size is set to zero before the call, causing kernel oopses on driver unload. Call scratchpad_free() before setting xhci->page_size to zero. Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> Acked-by: John Youn <John.Youn@synopsys.com> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/xhci-mem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 732580c6cbea..b8fd270a8b0d 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -843,9 +843,9 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci)
843 xhci->dcbaa, xhci->dcbaa->dma); 843 xhci->dcbaa, xhci->dcbaa->dma);
844 xhci->dcbaa = NULL; 844 xhci->dcbaa = NULL;
845 845
846 scratchpad_free(xhci);
846 xhci->page_size = 0; 847 xhci->page_size = 0;
847 xhci->page_shift = 0; 848 xhci->page_shift = 0;
848 scratchpad_free(xhci);
849} 849}
850 850
851int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) 851int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)