From 24cfe6e413a611530a97918623e1ead696a8e038 Mon Sep 17 00:00:00 2001
From: Stefan Hajnoczi <stefanha@gmail.com>
Date: Wed, 23 Nov 2011 08:20:44 +0000
Subject: [PATCH] --- yaml --- r: 280975 b: refs/heads/master c:
 3b08db37cb04a80dccac8c2d7b03690b5f179487 h: refs/heads/master i:   280973:
 005c1784584e8f7b64f7f84c3b975acd6ddf3295   280971:
 975b4bbc754aec5a5a745e9bddaa438b0f3a4449   280967:
 629d1d136b0f01239e2ad7f889b496d26c6efd21   280959:
 b415ecba1084ab751dcfcd9beaf894db52a7ba27 v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/staging/line6/pcm.c | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e3cbf09fd16e..93f066c7ba00 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1dc403ffecae26ae52414488e326761a9ae10de7
+refs/heads/master: 3b08db37cb04a80dccac8c2d7b03690b5f179487
diff --git a/trunk/drivers/staging/line6/pcm.c b/trunk/drivers/staging/line6/pcm.c
index f56c6427c36e..ae984344749f 100644
--- a/trunk/drivers/staging/line6/pcm.c
+++ b/trunk/drivers/staging/line6/pcm.c
@@ -452,9 +452,14 @@ int line6_init_pcm(struct usb_line6 *line6,
 	line6pcm->line6 = line6;
 	line6pcm->ep_audio_read = ep_read;
 	line6pcm->ep_audio_write = ep_write;
-	line6pcm->max_packet_size = usb_maxpacket(line6->usbdev,
-						  usb_rcvintpipe(line6->usbdev,
-								 ep_read), 0);
+
+	/* Read and write buffers are sized identically, so choose minimum */
+	line6pcm->max_packet_size = min(
+			usb_maxpacket(line6->usbdev,
+				usb_rcvisocpipe(line6->usbdev, ep_read), 0),
+			usb_maxpacket(line6->usbdev,
+				usb_sndisocpipe(line6->usbdev, ep_write), 1));
+
 	line6pcm->properties = properties;
 	line6->line6pcm = line6pcm;