X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Fmvebu%2Fpatches-3.10%2F0197-xhci-fix-dma-mask-setup-in-xhci.c.patch;h=1d2e18b52fd520ea5117ac63015d848b70c488c3;hp=84fcbafb5b9cd03f634377120a87a8224d766686;hb=f677b1bc7e37642eb1c42d3068ff3c44eb5ed3cb;hpb=6c8300df3d593abd911a3d6bb1a95eee4cfd06f8

diff --git a/target/linux/mvebu/patches-3.10/0197-xhci-fix-dma-mask-setup-in-xhci.c.patch b/target/linux/mvebu/patches-3.10/0197-xhci-fix-dma-mask-setup-in-xhci.c.patch
index 84fcbafb5b..1d2e18b52f 100644
--- a/target/linux/mvebu/patches-3.10/0197-xhci-fix-dma-mask-setup-in-xhci.c.patch
+++ b/target/linux/mvebu/patches-3.10/0197-xhci-fix-dma-mask-setup-in-xhci.c.patch
@@ -81,7 +81,7 @@ Conflicts:
  		return -ENOMEM;
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
-@@ -4654,7 +4654,6 @@ int xhci_gen_setup(struct usb_hcd *hcd,
+@@ -4657,7 +4657,6 @@ int xhci_gen_setup(struct usb_hcd *hcd,
  	struct xhci_hcd		*xhci;
  	struct device		*dev = hcd->self.controller;
  	int			retval;
@@ -89,7 +89,7 @@ Conflicts:
  
  	/* Accept arbitrarily long scatter-gather lists */
  	hcd->self.sg_tablesize = ~0;
-@@ -4682,14 +4681,6 @@ int xhci_gen_setup(struct usb_hcd *hcd,
+@@ -4685,14 +4684,6 @@ int xhci_gen_setup(struct usb_hcd *hcd,
  		/* xHCI private pointer was set in xhci_pci_probe for the second
  		 * registered roothub.
  		 */
@@ -104,7 +104,7 @@ Conflicts:
  		return 0;
  	}
  
-@@ -4728,12 +4719,12 @@ int xhci_gen_setup(struct usb_hcd *hcd,
+@@ -4731,12 +4722,12 @@ int xhci_gen_setup(struct usb_hcd *hcd,
  		goto error;
  	xhci_dbg(xhci, "Reset complete\n");