diff options
Diffstat (limited to 'sound/pci/ymfpci/ymfpci.c')
-rw-r--r-- | sound/pci/ymfpci/ymfpci.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c index 186453f7abe7..fd9b7b83a884 100644 --- a/sound/pci/ymfpci/ymfpci.c +++ b/sound/pci/ymfpci/ymfpci.c | |||
@@ -49,7 +49,6 @@ static long mpu_port[SNDRV_CARDS]; | |||
49 | static long joystick_port[SNDRV_CARDS]; | 49 | static long joystick_port[SNDRV_CARDS]; |
50 | #endif | 50 | #endif |
51 | static int rear_switch[SNDRV_CARDS]; | 51 | static int rear_switch[SNDRV_CARDS]; |
52 | static int rear_swap[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = 1 }; | ||
53 | 52 | ||
54 | module_param_array(index, int, NULL, 0444); | 53 | module_param_array(index, int, NULL, 0444); |
55 | MODULE_PARM_DESC(index, "Index value for the Yamaha DS-1 PCI soundcard."); | 54 | MODULE_PARM_DESC(index, "Index value for the Yamaha DS-1 PCI soundcard."); |
@@ -67,8 +66,6 @@ MODULE_PARM_DESC(joystick_port, "Joystick port address"); | |||
67 | #endif | 66 | #endif |
68 | module_param_array(rear_switch, bool, NULL, 0444); | 67 | module_param_array(rear_switch, bool, NULL, 0444); |
69 | MODULE_PARM_DESC(rear_switch, "Enable shared rear/line-in switch"); | 68 | MODULE_PARM_DESC(rear_switch, "Enable shared rear/line-in switch"); |
70 | module_param_array(rear_swap, bool, NULL, 0444); | ||
71 | MODULE_PARM_DESC(rear_swap, "Swap rear channels (must be enabled for correct IEC958 (S/PDIF)) output"); | ||
72 | 69 | ||
73 | static struct pci_device_id snd_ymfpci_ids[] = { | 70 | static struct pci_device_id snd_ymfpci_ids[] = { |
74 | { 0x1073, 0x0004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* YMF724 */ | 71 | { 0x1073, 0x0004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* YMF724 */ |
@@ -298,7 +295,7 @@ static int __devinit snd_card_ymfpci_probe(struct pci_dev *pci, | |||
298 | snd_card_free(card); | 295 | snd_card_free(card); |
299 | return err; | 296 | return err; |
300 | } | 297 | } |
301 | if ((err = snd_ymfpci_mixer(chip, rear_switch[dev], rear_swap[dev])) < 0) { | 298 | if ((err = snd_ymfpci_mixer(chip, rear_switch[dev])) < 0) { |
302 | snd_card_free(card); | 299 | snd_card_free(card); |
303 | return err; | 300 | return err; |
304 | } | 301 | } |