From 16a8b78c38dd299cd4188612b2c4d66575463a54 Mon Sep 17 00:00:00 2001
From: Clemens Ladisch <clemens@ladisch.de>
Date: Mon, 10 Jan 2011 16:34:15 +0100
Subject: [PATCH] --- yaml --- r: 230143 b: refs/heads/master c:
 860cffd57acff68e8bc5465f4dd3b7d338fb8e62 h: refs/heads/master i:   230141:
 bd96bbb402f8c26c275ad546c2569dce9ec55ebb   230139:
 98865eebf51d2e7db4874d4ba25e285f73ef6a5b   230135:
 220b5c9ac6d0a65820382abb821d8925edef6b7e   230127:
 51853a47fb5a30e6c621524256667f0b43933104   230111:
 092bf80329a608cd7bec54fe0b256103c1bc4eec   230079:
 07d652569d0c66f25822ccf2986ea0385aa98ab9   230015:
 f837feac44b5a20a89d370b7305c410cadb871f9   229887:
 fae95530d3dc8c003f35c5920c055f695711915f v: v3

---
 [refs]                                |  2 +-
 trunk/sound/pci/oxygen/oxygen_mixer.c | 30 ++++++++++++++++++---------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 04b097ad54e1..0c4049b5a9fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af39917d5a59d82f50bf9f5fadaa53944e5abf76
+refs/heads/master: 860cffd57acff68e8bc5465f4dd3b7d338fb8e62
diff --git a/trunk/sound/pci/oxygen/oxygen_mixer.c b/trunk/sound/pci/oxygen/oxygen_mixer.c
index 821df1c9d1d0..9bff14d5895d 100644
--- a/trunk/sound/pci/oxygen/oxygen_mixer.c
+++ b/trunk/sound/pci/oxygen/oxygen_mixer.c
@@ -434,30 +434,31 @@ static int spdif_input_default_get(struct snd_kcontrol *ctl,
 	return 0;
 }
 
-static int spdif_loopback_get(struct snd_kcontrol *ctl,
-			      struct snd_ctl_elem_value *value)
+static int spdif_bit_switch_get(struct snd_kcontrol *ctl,
+				struct snd_ctl_elem_value *value)
 {
 	struct oxygen *chip = ctl->private_data;
+	u32 bit = ctl->private_value;
 
 	value->value.integer.value[0] =
-		!!(oxygen_read32(chip, OXYGEN_SPDIF_CONTROL)
-		   & OXYGEN_SPDIF_LOOPBACK);
+		!!(oxygen_read32(chip, OXYGEN_SPDIF_CONTROL) & bit);
 	return 0;
 }
 
-static int spdif_loopback_put(struct snd_kcontrol *ctl,
-			      struct snd_ctl_elem_value *value)
+static int spdif_bit_switch_put(struct snd_kcontrol *ctl,
+				struct snd_ctl_elem_value *value)
 {
 	struct oxygen *chip = ctl->private_data;
+	u32 bit = ctl->private_value;
 	u32 oldreg, newreg;
 	int changed;
 
 	spin_lock_irq(&chip->reg_lock);
 	oldreg = oxygen_read32(chip, OXYGEN_SPDIF_CONTROL);
 	if (value->value.integer.value[0])
-		newreg = oldreg | OXYGEN_SPDIF_LOOPBACK;
+		newreg = oldreg | bit;
 	else
-		newreg = oldreg & ~OXYGEN_SPDIF_LOOPBACK;
+		newreg = oldreg & ~bit;
 	changed = newreg != oldreg;
 	if (changed)
 		oxygen_write32(chip, OXYGEN_SPDIF_CONTROL, newreg);
@@ -835,8 +836,17 @@ static const struct snd_kcontrol_new spdif_input_controls[] = {
 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
 		.name = SNDRV_CTL_NAME_IEC958("Loopback ", NONE, SWITCH),
 		.info = snd_ctl_boolean_mono_info,
-		.get = spdif_loopback_get,
-		.put = spdif_loopback_put,
+		.get = spdif_bit_switch_get,
+		.put = spdif_bit_switch_put,
+		.private_value = OXYGEN_SPDIF_LOOPBACK,
+	},
+	{
+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+		.name = SNDRV_CTL_NAME_IEC958("Validity Check ",CAPTURE,SWITCH),
+		.info = snd_ctl_boolean_mono_info,
+		.get = spdif_bit_switch_get,
+		.put = spdif_bit_switch_put,
+		.private_value = OXYGEN_SPDIF_SPDVALID,
 	},
 };