Skip to content

Commit

Permalink
Merge branch 'topic/caiaq' into for-linus
Browse files Browse the repository at this point in the history
* topic/caiaq:
  ALSA: snd_usb_caiaq: fix legacy input streaming
  • Loading branch information
Takashi Iwai committed Jun 21, 2009
2 parents 9fd0d96 + 0a842c8 commit 0b6306f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions sound/usb/caiaq/audio.c
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,9 @@ static int snd_usb_caiaq_pcm_prepare(struct snd_pcm_substream *substream)
dev->period_out_count[index] = BYTES_PER_SAMPLE + 1;
dev->audio_out_buf_pos[index] = BYTES_PER_SAMPLE + 1;
} else {
dev->period_in_count[index] = BYTES_PER_SAMPLE;
dev->audio_in_buf_pos[index] = BYTES_PER_SAMPLE;
int in_pos = (dev->spec.data_alignment == 2) ? 0 : 2;
dev->period_in_count[index] = BYTES_PER_SAMPLE + in_pos;
dev->audio_in_buf_pos[index] = BYTES_PER_SAMPLE + in_pos;
}

if (dev->streaming)
Expand Down
2 changes: 1 addition & 1 deletion sound/usb/caiaq/device.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include "input.h"

MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
MODULE_DESCRIPTION("caiaq USB audio, version 1.3.16");
MODULE_DESCRIPTION("caiaq USB audio, version 1.3.17");
MODULE_LICENSE("GPL");
MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
"{Native Instruments, RigKontrol3},"
Expand Down

0 comments on commit 0b6306f

Please sign in to comment.