diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /sound/isa/opl3sa2.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'sound/isa/opl3sa2.c')
| -rw-r--r-- | sound/isa/opl3sa2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c index 265abcce9dba..9b915e27b5bd 100644 --- a/sound/isa/opl3sa2.c +++ b/sound/isa/opl3sa2.c | |||
| @@ -264,7 +264,7 @@ static int __devinit snd_opl3sa2_detect(struct snd_card *card) | |||
| 264 | snd_printd("OPL3-SA [0x%lx] detect (1) = 0x%x (0x%x)\n", port, tmp, tmp1); | 264 | snd_printd("OPL3-SA [0x%lx] detect (1) = 0x%x (0x%x)\n", port, tmp, tmp1); |
| 265 | return -ENODEV; | 265 | return -ENODEV; |
| 266 | } | 266 | } |
| 267 | /* try if the MIC register is accesible */ | 267 | /* try if the MIC register is accessible */ |
| 268 | tmp = snd_opl3sa2_read(chip, OPL3SA2_MIC); | 268 | tmp = snd_opl3sa2_read(chip, OPL3SA2_MIC); |
| 269 | snd_opl3sa2_write(chip, OPL3SA2_MIC, 0x8a); | 269 | snd_opl3sa2_write(chip, OPL3SA2_MIC, 0x8a); |
| 270 | if (((tmp1 = snd_opl3sa2_read(chip, OPL3SA2_MIC)) & 0x9f) != 0x8a) { | 270 | if (((tmp1 = snd_opl3sa2_read(chip, OPL3SA2_MIC)) & 0x9f) != 0x8a) { |