Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e9fc6bd authored by Daniel Mack's avatar Daniel Mack Committed by Takashi Iwai
Browse files

[ALSA] snd_usb_caiaq: make high sample rates work with A8DJ 



This patch for snd_usb_caiaq makes sample rates higher dann 48KHz work
with devices which have more than 2 stereo input/output pairs.

Signed-off-by: default avatarDaniel Mack <daniel@caiaq.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6849d49c

sound/usb/caiaq/caiaq-audio.c

+6 −2
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#define BYTES_PER_SAMPLE	3

#define BYTES_PER_SAMPLE_USB	4

#define MAX_BUFFER_SIZE		(128*1024)

#define MAX_ENDPOINT_SIZE	512



#define ENDPOINT_CAPTURE	2

#define ENDPOINT_PLAYBACK	6
@@ -222,6 +223,9 @@ static int snd_usb_caiaq_pcm_prepare(struct snd_pcm_substream *substream) 
	bpp = ((runtime->rate / 8000) + CLOCK_DRIFT_TOLERANCE)

		* bytes_per_sample * CHANNELS_PER_STREAM * dev->n_streams;



	if (bpp > MAX_ENDPOINT_SIZE)

		bpp = MAX_ENDPOINT_SIZE;



	ret = snd_usb_caiaq_set_audio_params(dev, runtime->rate,

					     runtime->sample_bits, bpp);

	if (ret)

sound/usb/caiaq/caiaq-device.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
#endif



MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");

MODULE_DESCRIPTION("caiaq USB audio, version 1.3.5");

MODULE_DESCRIPTION("caiaq USB audio, version 1.3.6");

MODULE_LICENSE("GPL");

MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"

			 "{Native Instruments, RigKontrol3},"