commit 093498c3387f38a2c05b5f63e5cca21ae12a6b0c
author Linux Build Service Account <lnxbuild@localhost> Thu Oct 11 16:05:22 2012 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Oct 11 16:05:21 2012 -0700
tree 795e35a2ea59b454a6164fa358a5900b594d0343
parent f7bb007eb1532ae4cc75157ba805e9611690aac6
parent cbc8ed8d2f6b89f33ef37705a39dda653bbffdb6

Merge "USB: gadget: f_audio_source: Fix error handling and increase packet size"

drivers/usb/gadget/f_audio_source.c

diff --git a/drivers/usb/gadget/f_audio_source.c b/drivers/usb/gadget/f_audio_source.c
index 46cf879..0471f888 100644
--- a/drivers/usb/gadget/f_audio_source.c
+++ b/drivers/usb/gadget/f_audio_source.c
@@ -22,11 +22,9 @@
 #include <sound/pcm.h>
 
 #define SAMPLE_RATE 44100
-/* Each frame is two 16 bit integers (one per channel) */
-#define BYTES_PER_FRAME 4
 #define FRAMES_PER_MSEC (SAMPLE_RATE / 1000)
 
-#define IN_EP_MAX_PACKET_SIZE 256
+#define IN_EP_MAX_PACKET_SIZE 384
 
 /* Number of requests to allocate */
 #define IN_EP_REQ_COUNT 4
@@ -410,7 +408,7 @@
 
 	audio_req_put(audio, req);
 
-	if (!audio->buffer_start)
+	if (!audio->buffer_start || req->status)
 		return;
 
 	audio->period_offset += req->actual;