| Date | Sun, 06 Dec 2009 16:00:23 -0800 | From | Greg KH <> | Subject | [047/119] USB: xhci: Fix scratchpad deallocation. |
| |
2.6.31-stable review patch. If anyone has any objections, please let us know.
------------------ From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
commit 5294bea40666db5c5d6c336b8e4e55d69fa576ca upstream.
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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- drivers/usb/host/xhci-mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -797,9 +797,9 @@ void xhci_mem_cleanup(struct xhci_hcd *x xhci->dcbaa, xhci->dcbaa->dma); xhci->dcbaa = NULL; + scratchpad_free(xhci); xhci->page_size = 0; xhci->page_shift = 0; - scratchpad_free(xhci); } int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
|