X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Fpci%2Fymfpci%2Fymfpci_main.c;h=a1aa74b79b3d9c2086aa6acc21df188cbbcf12b9;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=8ac5ab50b5c7694b152e4559dece4e4fa7f6e1ff;hpb=e6a27dba1cf83d871b2dfcd64f04f12a67e3f4d5;p=linux-2.6.git

diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index 8ac5ab50b..a1aa74b79 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -536,30 +536,15 @@ static void snd_ymfpci_pcm_init_voice(struct snd_ymfpci_pcm *ypcm, unsigned int
 			}
 		}
 		if (ypcm->output_rear) {
-		        if (!ypcm->swap_rear) {
-        			if (use_left) {
-        				bank->eff2_gain =
-        				bank->eff2_gain_end = vol_left;
-        			}
-        			if (use_right) {
-        				bank->eff3_gain =
-        				bank->eff3_gain_end = vol_right;
-        			}
-		        } else {
-        			/* The SPDIF out channels seem to be swapped, so we have
-        			 * to swap them here, too.  The rear analog out channels
-        			 * will be wrong, but otherwise AC3 would not work.
-        			 */
-        			if (use_left) {
-        				bank->eff3_gain =
-        				bank->eff3_gain_end = vol_left;
-        			}
-        			if (use_right) {
-        				bank->eff2_gain =
-        				bank->eff2_gain_end = vol_right;
-        			}
-        		}
-                }
+			if (use_left) {
+				bank->eff2_gain =
+				bank->eff2_gain_end = vol_left;
+			}
+			if (use_right) {
+				bank->eff3_gain =
+				bank->eff3_gain_end = vol_right;
+			}
+		}
 	}
 }
 
@@ -909,7 +894,6 @@ static int snd_ymfpci_playback_open(struct snd_pcm_substream *substream)
 	ypcm = runtime->private_data;
 	ypcm->output_front = 1;
 	ypcm->output_rear = chip->mode_dup4ch ? 1 : 0;
-	ypcm->swap_rear = chip->rear_swap;
 	spin_lock_irq(&chip->reg_lock);
 	if (ypcm->output_rear) {
 		ymfpci_open_extension(chip);
@@ -1750,7 +1734,7 @@ static void snd_ymfpci_mixer_free_ac97(struct snd_ac97 *ac97)
 	chip->ac97 = NULL;
 }
 
-int __devinit snd_ymfpci_mixer(struct snd_ymfpci *chip, int rear_switch, int rear_swap)
+int __devinit snd_ymfpci_mixer(struct snd_ymfpci *chip, int rear_switch)
 {
 	struct snd_ac97_template ac97;
 	struct snd_kcontrol *kctl;
@@ -1762,7 +1746,6 @@ int __devinit snd_ymfpci_mixer(struct snd_ymfpci *chip, int rear_switch, int rea
 		.read = snd_ymfpci_codec_read,
 	};
 
-	chip->rear_swap = rear_swap;
 	if ((err = snd_ac97_bus(chip->card, 0, &ops, chip, &chip->ac97_bus)) < 0)
 		return err;
 	chip->ac97_bus->private_free = snd_ymfpci_mixer_free_ac97_bus;
@@ -2310,7 +2293,6 @@ int __devinit snd_ymfpci_create(struct snd_card *card,
 		return -EIO;
 	}
 
-	chip->rear_swap = 1;
 	if ((err = snd_ymfpci_ac3_init(chip)) < 0) {
 		snd_ymfpci_free(chip);
 		return err;