summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorJames Courtier-Dutton <James@superbug.co.uk>2005-12-21 15:41:50 +0100
committerJaroslav Kysela <perex@suse.cz>2006-01-03 12:31:03 +0100
commit28bcbdddaffcb2ccf08d06db7cecf047ec66057d (patch)
tree981402d6e7ef6956818e4ff8799c925ea47e9bd2 /sound
parent[ALSA] snd-emu10k1: Enable speakers on Audigy 2 ZS Notebook. (diff)
downloadlinux-28bcbdddaffcb2ccf08d06db7cecf047ec66057d.tar.xz
linux-28bcbdddaffcb2ccf08d06db7cecf047ec66057d.zip
[ALSA] snd-emu10k1: Fix whitespace.
Modules: EMU10K1/EMU10K2 driver Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/emu10k1/io.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/sound/pci/emu10k1/io.c b/sound/pci/emu10k1/io.c
index 7d0cb9db4280..08a0cb545822 100644
--- a/sound/pci/emu10k1/io.c
+++ b/sound/pci/emu10k1/io.c
@@ -130,15 +130,18 @@ int snd_emu10k1_spi_write(struct snd_emu10k1 * emu,
unsigned int reset, set;
unsigned int reg, tmp;
int n, result;
- if (emu->card_capabilities->ca0108_chip) {
- reg=0x3c; /* PTR20, reg 0x3c */
- } else {
- return 1; /* For other cards types the SPI register is currently unknown. */
+ if (emu->card_capabilities->ca0108_chip)
+ reg = 0x3c; /* PTR20, reg 0x3c */
+ else {
+ /* For other chip types the SPI register
+ * is currently unknown. */
+ return 1;
}
- if (data > 0xffff) return 1; /* Only 16bit values allowed */
+ if (data > 0xffff) /* Only 16bit values allowed */
+ return 1;
tmp = snd_emu10k1_ptr20_read(emu, reg, 0);
- reset = (tmp & ~0x3ffff) | 0x20000; /* Set xxx20000 */
+ reset = (tmp & ~0x3ffff) | 0x20000; /* Set xxx20000 */
set = reset | 0x10000; /* Set xxx1xxxx */
snd_emu10k1_ptr20_write(emu, reg, 0, reset | data);
tmp = snd_emu10k1_ptr20_read(emu, reg, 0); /* write post */