diff options
| author | Mike Lockwood <lockwood@google.com> | 2012-08-02 11:22:05 -0700 |
|---|---|---|
| committer | JP Abgrall <jpa@google.com> | 2012-08-03 10:35:29 -0700 |
| commit | 44537a302ed5bccab183aa01d6f67cad95f9099b (patch) | |
| tree | c30f344ac0b94402f31d55dd0a10b1535e7c488a /drivers/usb/gadget | |
| parent | 01c8ab45cfeacf6bc194c1a0481552d79d8fe9ba (diff) | |
| download | kernel_samsung_aries-44537a302ed5bccab183aa01d6f67cad95f9099b.zip kernel_samsung_aries-44537a302ed5bccab183aa01d6f67cad95f9099b.tar.gz kernel_samsung_aries-44537a302ed5bccab183aa01d6f67cad95f9099b.tar.bz2 | |
USB: gadget: f_audio_source: Fix error handling and increase packet size
Fixes watchdog reset on USB disconnect
Larger packet size fixes performance in fullspeed mode
Signed-off-by: Mike Lockwood <lockwood@google.com>
Diffstat (limited to 'drivers/usb/gadget')
| -rw-r--r-- | drivers/usb/gadget/f_audio_source.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/gadget/f_audio_source.c b/drivers/usb/gadget/f_audio_source.c index 23a7511..ba8e007 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 @@ -414,7 +412,7 @@ static void audio_data_complete(struct usb_ep *ep, struct usb_request *req) audio_req_put(audio, req); - if (!audio->buffer_start) + if (!audio->buffer_start || req->status) return; audio->period_offset += req->actual; |