diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
commit | 9caafa6c8686e319cf4d5f3757b3972c6c522b7c (patch) | |
tree | b38979b835b5d22e681b175d0b98a3c7560d9c59 /sound/pci/ymfpci/ymfpci_main.c | |
parent | 51e9f2ff83df6b1c81c5c44f4486c68ed87aa20e (diff) | |
parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) |
Merge branch 'upstream-fixes'
Diffstat (limited to 'sound/pci/ymfpci/ymfpci_main.c')
-rw-r--r-- | sound/pci/ymfpci/ymfpci_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c index 1dfc7233c6a8..a1aa74b79b3d 100644 --- a/sound/pci/ymfpci/ymfpci_main.c +++ b/sound/pci/ymfpci/ymfpci_main.c | |||
@@ -1229,6 +1229,7 @@ static int snd_ymfpci_spdif_default_get(struct snd_kcontrol *kcontrol, | |||
1229 | spin_lock_irq(&chip->reg_lock); | 1229 | spin_lock_irq(&chip->reg_lock); |
1230 | ucontrol->value.iec958.status[0] = (chip->spdif_bits >> 0) & 0xff; | 1230 | ucontrol->value.iec958.status[0] = (chip->spdif_bits >> 0) & 0xff; |
1231 | ucontrol->value.iec958.status[1] = (chip->spdif_bits >> 8) & 0xff; | 1231 | ucontrol->value.iec958.status[1] = (chip->spdif_bits >> 8) & 0xff; |
1232 | ucontrol->value.iec958.status[3] = IEC958_AES3_CON_FS_48000; | ||
1232 | spin_unlock_irq(&chip->reg_lock); | 1233 | spin_unlock_irq(&chip->reg_lock); |
1233 | return 0; | 1234 | return 0; |
1234 | } | 1235 | } |
@@ -1303,6 +1304,7 @@ static int snd_ymfpci_spdif_stream_get(struct snd_kcontrol *kcontrol, | |||
1303 | spin_lock_irq(&chip->reg_lock); | 1304 | spin_lock_irq(&chip->reg_lock); |
1304 | ucontrol->value.iec958.status[0] = (chip->spdif_pcm_bits >> 0) & 0xff; | 1305 | ucontrol->value.iec958.status[0] = (chip->spdif_pcm_bits >> 0) & 0xff; |
1305 | ucontrol->value.iec958.status[1] = (chip->spdif_pcm_bits >> 8) & 0xff; | 1306 | ucontrol->value.iec958.status[1] = (chip->spdif_pcm_bits >> 8) & 0xff; |
1307 | ucontrol->value.iec958.status[3] = IEC958_AES3_CON_FS_48000; | ||
1306 | spin_unlock_irq(&chip->reg_lock); | 1308 | spin_unlock_irq(&chip->reg_lock); |
1307 | return 0; | 1309 | return 0; |
1308 | } | 1310 | } |