Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a971c3d42524afc5619fa271d59d29be3c1661e3 Commit: a971c3d42524afc5619fa271d59d29be3c1661e3 Parent: c052f046240b094b2ec12e0004e47756302e2b55 Author: Karsten Wiese <[EMAIL PROTECTED]> AuthorDate: Thu Mar 29 17:02:45 2007 +0200 Committer: Jaroslav Kysela <[EMAIL PROTECTED]> CommitDate: Fri May 11 16:55:55 2007 +0200
[ALSA] snd-usb-caiaq: Make playback work some typo fixes. Signed-off-by: Karsten Wiese <[EMAIL PROTECTED]> Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]> Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]> --- sound/usb/caiaq/caiaq-audio.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sound/usb/caiaq/caiaq-audio.c b/sound/usb/caiaq/caiaq-audio.c index e80c8db..0414d76 100644 --- a/sound/usb/caiaq/caiaq-audio.c +++ b/sound/usb/caiaq/caiaq-audio.c @@ -388,8 +388,8 @@ static void read_in_urb_mode2(struct snd_usb_caiaqdev *dev, struct snd_pcm_runtime *rt = sub->runtime; char *audio_buf = rt->dma_area; int sz = frames_to_bytes(rt, rt->buffer_size); - audio_buf[dev->audio_in_buf_pos[stream]++] - = usb_buf[i]; + audio_buf[dev->audio_in_buf_pos[stream]++] = + usb_buf[i]; dev->period_in_count[stream]++; if (dev->audio_in_buf_pos[stream] == sz) dev->audio_in_buf_pos[stream] = 0; @@ -436,19 +436,21 @@ static void fill_out_urb(struct snd_usb_caiaqdev *dev, spin_lock(&dev->spinlock); for (i = 0; i < iso->length;) { - for (stream = 0; stream < dev->n_streams; stream++) { + for (stream = 0; stream < dev->n_streams; stream++, i++) { sub = dev->sub_playback[stream]; if (sub) { struct snd_pcm_runtime *rt = sub->runtime; char *audio_buf = rt->dma_area; int sz = frames_to_bytes(rt, rt->buffer_size); - usb_buf[i++] - = audio_buf[dev->audio_out_buf_pos[stream]++]; + usb_buf[i] = + audio_buf[dev->audio_out_buf_pos[stream]]; + dev->period_out_count[stream]++; dev->audio_out_buf_pos[stream]++; if (dev->audio_out_buf_pos[stream] == sz) dev->audio_out_buf_pos[stream] = 0; } else - usb_buf[i++] = 0; + usb_buf[i] = 0; + } /* fill in the check bytes */ if (dev->spec.data_alignment == 2 && @@ -456,7 +458,6 @@ static void fill_out_urb(struct snd_usb_caiaqdev *dev, (dev->n_streams * CHANNELS_PER_STREAM)) for (stream = 0; stream < dev->n_streams; stream++, i++) usb_buf[i] = MAKE_CHECKBYTE(dev, stream, i); - } } spin_unlock(&dev->spinlock); - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html