sound fixes for 3.11-rc5
Linus,
The following changes since commit 697aebab78a88c6b164cfb74d19b86817d2ccd82:
ALSA: hda - Fix missing fixup for Mac Mini with STAC9221 (2013-08-02 08:16:52 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-3.11
for you to fetch changes up to 57e6dae1087bbaa6b33d3dd8a8e90b63888939a3:
ALSA: usb-audio: do not trust too-big wMaxPacketSize values (2013-08-08 11:37:34 +0200)
----------------------------------------------------------------
sound fixes for 3.11-rc5
A couple of USB-audio fixes that should also go to stable kernels.
----------------------------------------------------------------
Clemens Ladisch (1):
ALSA: usb-audio: do not trust too-big wMaxPacketSize values
Jussi Kivilinna (1):
ALSA: 6fire: fix DMA issues with URB transfer_buffer usage
sound/usb/6fire/comm.c | 38 +++++++++++++++++++++++++++++++++----- sound/usb/6fire/comm.h | 2 +- sound/usb/endpoint.c | 13 ++++++------- 3 files changed, 40 insertions(+), 13 deletions(-)
sound/usb/6fire/comm.c +33 -5
@@ -110,19 +110,37 @@ static int usb6fire_comm_send_buffer(u8 *buffer, struct usb_device *dev)static int usb6fire_comm_write8 (struct comm_runtime *rt,u8 request,u8 reg,u8 value) { -u8 buffer[13 ];/* 13: maximum length of message */ +u8 *buffer; +int ret; + +/* 13: maximum length of message */ + buffer =kmalloc (13 ,GFP_KERNEL ); +if (!buffer) +return -ENOMEM ;usb6fire_comm_init_buffer (buffer,0x00 , request, reg, value,0x00 ); -return usb6fire_comm_send_buffer (buffer, rt->chip->dev); + ret =usb6fire_comm_send_buffer (buffer, rt->chip->dev); + +kfree (buffer); +return ret; }static int usb6fire_comm_write16 (struct comm_runtime *rt,u8 request,u8 reg,u8 vl,u8 vh) { -u8 buffer[13 ];/* 13: maximum length of message */ +u8 *buffer; +int ret; + +/* 13: maximum length of message */ + buffer =kmalloc (13 ,GFP_KERNEL ); +if (!buffer) +return -ENOMEM ;usb6fire_comm_init_buffer (buffer,0x00 , request, reg, vl, vh); -return usb6fire_comm_send_buffer (buffer, rt->chip->dev); + ret =usb6fire_comm_send_buffer (buffer, rt->chip->dev); + +kfree (buffer); +return ret; }int usb6fire_comm_init (struct sfire_chip *chip)
@@ -135,6 +153,12 @@ int usb6fire_comm_init(struct sfire_chip *chip)if (!rt)return -ENOMEM ; + rt->receiver_buffer =kzalloc (COMM_RECEIVER_BUFSIZE ,GFP_KERNEL ); +if (!rt->receiver_buffer) { +kfree (rt); +return -ENOMEM ; + } + urb = &rt->receiver; rt->serial =1 ; rt->chip = chip;
@@ -153,6 +177,7 @@ int usb6fire_comm_init(struct sfire_chip *chip) urb->interval =1 ; ret =usb_submit_urb (urb,GFP_KERNEL );if (ret <0 ) { +kfree (rt->receiver_buffer);kfree (rt); snd_printk(KERN_ERR PREFIX "cannot create comm data receiver.");return ret;
@@ -171,6 +196,9 @@ void usb6fire_comm_abort(struct sfire_chip *chip)void usb6fire_comm_destroy (struct sfire_chip *chip) { -kfree (chip->comm); +struct comm_runtime *rt = chip->comm; + +kfree (rt->receiver_buffer); +kfree (rt); chip->comm =NULL ; }
sound/usb/6fire/comm.h +1 -1
@@ -24,7 +24,7 @@ struct comm_runtime {struct sfire_chip *chip;struct urb receiver; -u8 receiver_buffer[COMM_RECEIVER_BUFSIZE ]; +u8 *receiver_buffer;u8 serial;/* urb serial */
sound/usb/endpoint.c +6 -7
@@ -591,17 +591,16 @@ static int data_ep_set_params(struct snd_usb_endpoint *ep, ep->stride = frame_bits >>3 ; ep->silence_value = pcm_format ==SNDRV_PCM_FORMAT_U8 ?0x80 :0 ; -/* calculate max. frequency */ -if (ep->maxpacksize) { +/* assume max. frequency is 25% higher than nominal */ + ep->freqmax = ep->freqn + (ep->freqn >>2 ); + maxsize = ((ep->freqmax +0xffff ) * (frame_bits >>3 )) + >> (16 - ep->datainterval); +/* but wMaxPacketSize might reduce this */ +if (ep->maxpacksize && ep->maxpacksize < maxsize) {/* whatever fits into a max. size packet */ maxsize = ep->maxpacksize; ep->freqmax = (maxsize / (frame_bits >>3 )) << (16 - ep->datainterval); - }else { -/* no max. packet size: just take 25% higher than nominal */ - ep->freqmax = ep->freqn + (ep->freqn >>2 ); - maxsize = ((ep->freqmax +0xffff ) * (frame_bits >>3 )) - >> (16 - ep->datainterval); }if (ep->fill_max)