Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"A couple of USB-audio fixes that should also go to stable kernels"
* tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: usb-audio: do not trust too-big wMaxPacketSize values
ALSA: 6fire: fix DMA issues with URB transfer_buffer usage
+40
-13
+33
-5
sound/usb/6fire/comm.c
+33
-5
sound/usb/6fire/comm.c
···
110
110
static int usb6fire_comm_write8(struct comm_runtime *rt, u8 request,
111
111
u8 reg, u8 value)
112
112
{
113
-
u8 buffer[13]; /* 13: maximum length of message */
113
+
u8 *buffer;
114
+
int ret;
115
+
116
+
/* 13: maximum length of message */
117
+
buffer = kmalloc(13, GFP_KERNEL);
118
+
if (!buffer)
119
+
return -ENOMEM;
114
120
115
121
usb6fire_comm_init_buffer(buffer, 0x00, request, reg, value, 0x00);
116
-
return usb6fire_comm_send_buffer(buffer, rt->chip->dev);
122
+
ret = usb6fire_comm_send_buffer(buffer, rt->chip->dev);
123
+
124
+
kfree(buffer);
125
+
return ret;
117
126
}
118
127
119
128
static int usb6fire_comm_write16(struct comm_runtime *rt, u8 request,
120
129
u8 reg, u8 vl, u8 vh)
121
130
{
122
-
u8 buffer[13]; /* 13: maximum length of message */
131
+
u8 *buffer;
132
+
int ret;
133
+
134
+
/* 13: maximum length of message */
135
+
buffer = kmalloc(13, GFP_KERNEL);
136
+
if (!buffer)
137
+
return -ENOMEM;
123
138
124
139
usb6fire_comm_init_buffer(buffer, 0x00, request, reg, vl, vh);
125
-
return usb6fire_comm_send_buffer(buffer, rt->chip->dev);
140
+
ret = usb6fire_comm_send_buffer(buffer, rt->chip->dev);
141
+
142
+
kfree(buffer);
143
+
return ret;
126
144
}
127
145
128
146
int usb6fire_comm_init(struct sfire_chip *chip)
···
152
134
153
135
if (!rt)
154
136
return -ENOMEM;
137
+
138
+
rt->receiver_buffer = kzalloc(COMM_RECEIVER_BUFSIZE, GFP_KERNEL);
139
+
if (!rt->receiver_buffer) {
140
+
kfree(rt);
141
+
return -ENOMEM;
142
+
}
155
143
156
144
urb = &rt->receiver;
157
145
rt->serial = 1;
···
177
153
urb->interval = 1;
178
154
ret = usb_submit_urb(urb, GFP_KERNEL);
179
155
if (ret < 0) {
156
+
kfree(rt->receiver_buffer);
180
157
kfree(rt);
181
158
snd_printk(KERN_ERR PREFIX "cannot create comm data receiver.");
182
159
return ret;
···
196
171
197
172
void usb6fire_comm_destroy(struct sfire_chip *chip)
198
173
{
199
-
kfree(chip->comm);
174
+
struct comm_runtime *rt = chip->comm;
175
+
176
+
kfree(rt->receiver_buffer);
177
+
kfree(rt);
200
178
chip->comm = NULL;
201
179
}
+1
-1
sound/usb/6fire/comm.h
+1
-1
sound/usb/6fire/comm.h
+6
-7
sound/usb/endpoint.c
+6
-7
sound/usb/endpoint.c
···
591
591
ep->stride = frame_bits >> 3;
592
592
ep->silence_value = pcm_format == SNDRV_PCM_FORMAT_U8 ? 0x80 : 0;
593
593
594
-
/* calculate max. frequency */
595
-
if (ep->maxpacksize) {
594
+
/* assume max. frequency is 25% higher than nominal */
595
+
ep->freqmax = ep->freqn + (ep->freqn >> 2);
596
+
maxsize = ((ep->freqmax + 0xffff) * (frame_bits >> 3))
597
+
>> (16 - ep->datainterval);
598
+
/* but wMaxPacketSize might reduce this */
599
+
if (ep->maxpacksize && ep->maxpacksize < maxsize) {
596
600
/* whatever fits into a max. size packet */
597
601
maxsize = ep->maxpacksize;
598
602
ep->freqmax = (maxsize / (frame_bits >> 3))
599
603
<< (16 - ep->datainterval);
600
-
} else {
601
-
/* no max. packet size: just take 25% higher than nominal */
602
-
ep->freqmax = ep->freqn + (ep->freqn >> 2);
603
-
maxsize = ((ep->freqmax + 0xffff) * (frame_bits >> 3))
604
-
>> (16 - ep->datainterval);
605
604
}
606
605
607
606
if (ep->fill_max)