Merge branch 'devel-3.4-pvusb4' of git://github.com/grwl/qubes-kernel into devel-3.7

Conflicts: rel-pvops
11 years ago · 167850e67d
parent ff6b605d69 4f9a1404eb
commit 167850e67d
1 changed files with 13 additions and 0 deletions
--- a/patches.xen/pvops-3.4-0101-usb-xen-pvusb-driver-bugfix.patch
+++ b/patches.xen/pvops-3.4-0101-usb-xen-pvusb-driver-bugfix.patch
@ -0,0 +1,13 @@
+diff -pur linux-3.4.18.orig/drivers/usb/host/xen-usbback/usbback.c linux-3.4.18/drivers/usb/host/xen-usbback/usbback.c
+--- linux-3.4.18.orig/drivers/usb/host/xen-usbback/usbback.c	2012-11-20 00:03:57.562663987 +0100
+++ linux-3.4.18/drivers/usb/host/xen-usbback/usbback.c	2012-12-09 16:16:36.395197677 +0100
+@@ -582,6 +582,8 @@
+ 		break;
+ 	}
+ 
+	urb->transfer_flags &= ~(URB_FREE_BUFFER);
+
+ 	if (req->buffer_length) {
+ 		urb->transfer_dma = pending_req->transfer_dma;
+ 		urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
+diff -pur linux-3.4.18.orig/drivers/usb/host/xen-usbfront.c linux-3.4.18/drivers/usb/host/xen-usbfront.c