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

Commit 0b6306f6 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/caiaq' into for-linus 

* topic/caiaq:
  ALSA: snd_usb_caiaq: fix legacy input streaming
parents 9fd0d96e 0a842c8b

sound/usb/caiaq/audio.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -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->period_out_count[index] = BYTES_PER_SAMPLE + 1;

		dev->audio_out_buf_pos[index] = BYTES_PER_SAMPLE + 1;

		dev->audio_out_buf_pos[index] = BYTES_PER_SAMPLE + 1;

	} else {

	} else {

		dev->period_in_count[index] = BYTES_PER_SAMPLE;

		int in_pos = (dev->spec.data_alignment == 2) ? 0 : 2;

		dev->audio_in_buf_pos[index] = BYTES_PER_SAMPLE;

		dev->period_in_count[index] = BYTES_PER_SAMPLE + in_pos;

		dev->audio_in_buf_pos[index] = BYTES_PER_SAMPLE + in_pos;

	}

	}





	if (dev->streaming)

	if (dev->streaming)

sound/usb/caiaq/device.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include "input.h"

#include "input.h"





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

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_LICENSE("GPL");

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

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

			 "{Native Instruments, RigKontrol3},"

			 "{Native Instruments, RigKontrol3},"