diff options
| author | Karsten Wiese <fzu@wemgehoertderstaat.de> | 2007-03-29 17:02:45 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2007-05-11 16:55:55 +0200 |
| commit | a971c3d42524afc5619fa271d59d29be3c1661e3 (patch) | |
| tree | 396bb4570775d50c4d7080339813f092f6c7cb3f /sound/usb | |
| parent | c052f046240b094b2ec12e0004e47756302e2b55 (diff) | |
| download | blackbird-op-linux-a971c3d42524afc5619fa271d59d29be3c1661e3.tar.gz blackbird-op-linux-a971c3d42524afc5619fa271d59d29be3c1661e3.zip | |
[ALSA] snd-usb-caiaq: Make playback work
some typo fixes.
Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | 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 e80c8db237d3..0414d766ba07 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); |
