summaryrefslogtreecommitdiffstats
path: root/kernel/sound/pci/oxygen
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sound/pci/oxygen')
-rw-r--r--kernel/sound/pci/oxygen/oxygen_lib.c4
-rw-r--r--kernel/sound/pci/oxygen/oxygen_mixer.c2
-rw-r--r--kernel/sound/pci/oxygen/xonar_wm87x6.c2
3 files changed, 2 insertions, 6 deletions
diff --git a/kernel/sound/pci/oxygen/oxygen_lib.c b/kernel/sound/pci/oxygen/oxygen_lib.c
index ffff3b25f..b4ef58042 100644
--- a/kernel/sound/pci/oxygen/oxygen_lib.c
+++ b/kernel/sound/pci/oxygen/oxygen_lib.c
@@ -196,7 +196,6 @@ static void oxygen_gpio_changed(struct work_struct *work)
chip->model.gpio_changed(chip);
}
-#ifdef CONFIG_PROC_FS
static void oxygen_proc_read(struct snd_info_entry *entry,
struct snd_info_buffer *buffer)
{
@@ -250,9 +249,6 @@ static void oxygen_proc_init(struct oxygen *chip)
if (!snd_card_proc_new(chip->card, "oxygen", &entry))
snd_info_set_text_ops(entry, chip, oxygen_proc_read);
}
-#else
-#define oxygen_proc_init(chip)
-#endif
static const struct pci_device_id *
oxygen_search_pci_id(struct oxygen *chip, const struct pci_device_id ids[])
diff --git a/kernel/sound/pci/oxygen/oxygen_mixer.c b/kernel/sound/pci/oxygen/oxygen_mixer.c
index 6492bca8c..4ca12665f 100644
--- a/kernel/sound/pci/oxygen/oxygen_mixer.c
+++ b/kernel/sound/pci/oxygen/oxygen_mixer.c
@@ -88,7 +88,7 @@ static int dac_mute_put(struct snd_kcontrol *ctl,
int changed;
mutex_lock(&chip->mutex);
- changed = !value->value.integer.value[0] != chip->dac_mute;
+ changed = (!value->value.integer.value[0]) != chip->dac_mute;
if (changed) {
chip->dac_mute = !value->value.integer.value[0];
chip->model.update_dac_mute(chip);
diff --git a/kernel/sound/pci/oxygen/xonar_wm87x6.c b/kernel/sound/pci/oxygen/xonar_wm87x6.c
index 6ce68604c..90ac479f3 100644
--- a/kernel/sound/pci/oxygen/xonar_wm87x6.c
+++ b/kernel/sound/pci/oxygen/xonar_wm87x6.c
@@ -286,7 +286,7 @@ static void xonar_ds_init(struct oxygen *chip)
xonar_enable_output(chip);
snd_jack_new(chip->card, "Headphone",
- SND_JACK_HEADPHONE, &data->hp_jack);
+ SND_JACK_HEADPHONE, &data->hp_jack, false, false);
xonar_ds_handle_hp_jack(chip);
snd_component_add(chip->card, "WM8776");