summaryrefslogtreecommitdiffstats
path: root/sound/pci/cs46xx
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-08-20 22:14:26 +0200
committerTakashi Iwai <tiwai@suse.de>2012-08-20 22:14:26 +0200
commitddf83485d7da468251716b8040bac1280622181e (patch)
treed28e9b511dedcfed447577f4bb49a99b244a9430 /sound/pci/cs46xx
parent099d53c308f50e8ee5b6638ec3f40f0104b3ee31 (diff)
parent535b6c51fe8293c88ce919cdfc4390c67a1cb6d1 (diff)
downloadop-kernel-dev-ddf83485d7da468251716b8040bac1280622181e.zip
op-kernel-dev-ddf83485d7da468251716b8040bac1280622181e.tar.gz
Merge branch 'for-linus' into for-next
Conflicts: sound/pci/hda/hda_codec.c Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/cs46xx')
-rw-r--r--sound/pci/cs46xx/cs46xx_lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
index 6b111d0..a2bb8c9 100644
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
@@ -94,7 +94,7 @@ static unsigned short snd_cs46xx_codec_read(struct snd_cs46xx *chip,
if (snd_BUG_ON(codec_index != CS46XX_PRIMARY_CODEC_INDEX &&
codec_index != CS46XX_SECONDARY_CODEC_INDEX))
- return -EINVAL;
+ return 0xffff;
chip->active_ctrl(chip, 1);
OpenPOWER on IntegriCloud