aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-09 20:06:53 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-09 20:06:53 -0500
commita457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b (patch)
tree23b1109d5d286d1e96424f0195ed8c3144e04eb1 /sound
parentdbc1651f0c5b7d13acc59d3b805a7224332fb1fb (diff)
parentb3c29d85bf0dcce9e99cbfba2811aeefae017aaa (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'sound')
-rw-r--r--sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c b/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
index 09cb250d5827..962e6d525564 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
@@ -209,7 +209,7 @@ static int pdacf_pcm_prepare(struct snd_pcm_substream *subs)
209 case SNDRV_PCM_FORMAT_S24_3LE: 209 case SNDRV_PCM_FORMAT_S24_3LE:
210 case SNDRV_PCM_FORMAT_S24_3BE: 210 case SNDRV_PCM_FORMAT_S24_3BE:
211 chip->pcm_sample = 3; 211 chip->pcm_sample = 3;
212 /* fall trough */ 212 /* fall through */
213 default: /* 24-bit */ 213 default: /* 24-bit */
214 aval = AK4117_DIF_24R; 214 aval = AK4117_DIF_24R;
215 chip->pcm_frame = 3; 215 chip->pcm_frame = 3;