diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-05-03 11:05:08 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-05-03 11:05:08 -0400 |
| commit | 2db3002029d6c8fbd8ad4ab21f501475cd8c96f9 (patch) | |
| tree | 1b0165b2af59214e16a5e667c2cdbf148f4879f1 /sound/pci/lola/lola_pcm.c | |
| parent | c7aad3c317afc05418414c95e877173799145d0b (diff) | |
ALSA: lola - Rename to Digital SRC Capture Switch
Renamed to Digial SRC Capture Switch for more correct representation.
Also fixed analog volume control on Lola161611 and lola881.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/lola/lola_pcm.c')
| -rw-r--r-- | sound/pci/lola/lola_pcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/lola/lola_pcm.c b/sound/pci/lola/lola_pcm.c index 5c0014cbff0..aa21750202f 100644 --- a/sound/pci/lola/lola_pcm.c +++ b/sound/pci/lola/lola_pcm.c | |||
| @@ -472,7 +472,7 @@ static int lola_pcm_prepare(struct snd_pcm_substream *substream) | |||
| 472 | mutex_lock(&chip->open_mutex); | 472 | mutex_lock(&chip->open_mutex); |
| 473 | lola_stream_reset(chip, str); | 473 | lola_stream_reset(chip, str); |
| 474 | lola_cleanup_slave_streams(pcm, str); | 474 | lola_cleanup_slave_streams(pcm, str); |
| 475 | if (str->index + runtime->channels >= pcm->num_streams) { | 475 | if (str->index + runtime->channels > pcm->num_streams) { |
| 476 | mutex_unlock(&chip->open_mutex); | 476 | mutex_unlock(&chip->open_mutex); |
| 477 | return -EINVAL; | 477 | return -EINVAL; |
| 478 | } | 478 | } |
| @@ -538,7 +538,7 @@ static int lola_pcm_trigger(struct snd_pcm_substream *substream, int cmd) | |||
| 538 | 538 | ||
| 539 | /* | 539 | /* |
| 540 | * sample correct synchronization is only needed starting several | 540 | * sample correct synchronization is only needed starting several |
| 541 | * streams on stop or if only one stream do as quick as possible | 541 | * streams. On stop or if only one stream do as quick as possible |
| 542 | */ | 542 | */ |
| 543 | sync_streams = (start && snd_pcm_stream_linked(substream)); | 543 | sync_streams = (start && snd_pcm_stream_linked(substream)); |
| 544 | tstamp = lola_get_tstamp(chip, !sync_streams); | 544 | tstamp = lola_get_tstamp(chip, !sync_streams); |