diff options
| author | Linus Torvalds | 2008-10-23 19:42:55 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-10-23 19:42:55 +0200 |
| commit | eb81071584bed0b04adcaf57e525638d0f92e1e1 (patch) | |
| tree | efd7f5a56299acf9ce96870a7e6e0d353330bdce /sound/pci/hda/patch_sigmatel.c | |
| parent | compat_blkdev_driver_ioctl: Remove unused variable warning (diff) | |
| parent | Merge branches 'topic/asoc', 'topic/misc-fixes' and 'topic/hda' into for-linus (diff) | |
| download | kernel-qcow2-linux-eb81071584bed0b04adcaf57e525638d0f92e1e1.tar.gz kernel-qcow2-linux-eb81071584bed0b04adcaf57e525638d0f92e1e1.tar.xz kernel-qcow2-linux-eb81071584bed0b04adcaf57e525638d0f92e1e1.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: aoa i2sbus: don't overwrite module parameter
ALSA: ASoC: tlv320aic3x: Fix DSP DAI format and signal polarities matching
ALSA: ASoC: OMAP: Continue fixing DSP DAI format in McBSP DAI driver
ALSA: Ensure PXA runtime data is initialised
ALSA: hda - correct bracketing in spdif test in patch_sigmatel.c
ALSA: hda - Fix conflicting volume controls on ALC260
Diffstat (limited to 'sound/pci/hda/patch_sigmatel.c')
| -rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index a2ac7205d45d..788fdc6f3264 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -1282,7 +1282,7 @@ static int stac92xx_build_controls(struct hda_codec *codec) return err; spec->multiout.share_spdif = 1; } - if (spec->dig_in_nid && (!spec->gpio_dir & 0x01)) { + if (spec->dig_in_nid && !(spec->gpio_dir & 0x01)) { err = snd_hda_create_spdif_in_ctls(codec, spec->dig_in_nid); if (err < 0) return err; |