2012-10-28 18:05:07 +00:00
|
|
|
From 138e9d997e487dafbf686e0e1eba44a8b26dcaf7 Mon Sep 17 00:00:00 2001
|
2012-09-07 15:20:05 +00:00
|
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
|
Date: Tue, 28 Aug 2012 11:33:47 +0200
|
2012-10-28 18:05:07 +00:00
|
|
|
Subject: [PATCH] usb-redir: Return babble when getting more bulk data then
|
|
|
|
requested
|
2012-09-07 15:20:05 +00:00
|
|
|
|
|
|
|
Babble is the appropriate error in this case (rather then signalling a stall).
|
|
|
|
|
|
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
2012-10-28 18:05:07 +00:00
|
|
|
(cherry picked from commit 2979a36183a3902cd75665e7c6bbc8668668fd17)
|
|
|
|
|
|
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
2012-09-07 15:20:05 +00:00
|
|
|
---
|
|
|
|
hw/usb/redirect.c | 6 +++---
|
|
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
|
2012-10-28 18:05:07 +00:00
|
|
|
index fd1f8cc..ee75217 100644
|
2012-09-07 15:20:05 +00:00
|
|
|
--- a/hw/usb/redirect.c
|
|
|
|
+++ b/hw/usb/redirect.c
|
2012-10-28 18:05:07 +00:00
|
|
|
@@ -1324,9 +1324,9 @@ static void usbredir_bulk_packet(void *priv, uint32_t id,
|
2012-09-07 15:20:05 +00:00
|
|
|
if (data_len <= p->iov.size) {
|
|
|
|
usb_packet_copy(p, data, data_len);
|
|
|
|
} else {
|
|
|
|
- ERROR("bulk buffer too small (%d > %zd)\n", data_len,
|
|
|
|
- p->iov.size);
|
|
|
|
- len = USB_RET_STALL;
|
|
|
|
+ ERROR("bulk got more data then requested (%d > %zd)\n",
|
|
|
|
+ data_len, p->iov.size);
|
|
|
|
+ len = USB_RET_BABBLE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
p->result = len;
|
|
|
|
--
|
2012-10-28 18:05:07 +00:00
|
|
|
1.7.12.1
|
2012-09-07 15:20:05 +00:00
|
|
|
|