aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/sound
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2020-01-26 14:20:57 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2020-01-26 14:20:57 +0000
commitc73222d0e6db4b4719b92d8622eabc343b609e1a (patch)
tree8d7b1898abe7d01680281bae37d9a38e1aeadd27 /sys/dev/sound
parent1207cda9614c0efa314f5bef902cd12d77cf4d97 (diff)
downloadsrc-c73222d0e6db4b4719b92d8622eabc343b609e1a.tar.gz
src-c73222d0e6db4b4719b92d8622eabc343b609e1a.zip
Fix some misleading indentation warnings reported by recent clang.
These should not be any functional change. While the change in emul10kx-pcm.c looks like a real bug fix (as opposed to inconsistent whitespace), the extra statements were not harmful. Reviewed by: kib Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D23363
Notes
Notes: svn path=/head/; revision=357146
Diffstat (limited to 'sys/dev/sound')
-rw-r--r--sys/dev/sound/pci/emu10k1.c11
-rw-r--r--sys/dev/sound/pci/emu10kx-pcm.c3
2 files changed, 8 insertions, 6 deletions
diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c
index 028f100c5953..94769b38faf0 100644
--- a/sys/dev/sound/pci/emu10k1.c
+++ b/sys/dev/sound/pci/emu10k1.c
@@ -1257,11 +1257,12 @@ emu_intr(void *data)
#endif
}
- if (stat & EMU_IPR_MIDIRECVBUFE)
- if (sc->mpu_intr) {
- (sc->mpu_intr)(sc->mpu);
- ack |= EMU_IPR_MIDIRECVBUFE | EMU_IPR_MIDITRANSBUFE;
- }
+ if (stat & EMU_IPR_MIDIRECVBUFE) {
+ if (sc->mpu_intr) {
+ (sc->mpu_intr)(sc->mpu);
+ ack |= EMU_IPR_MIDIRECVBUFE | EMU_IPR_MIDITRANSBUFE;
+ }
+ }
if (stat & ~ack)
device_printf(sc->dev, "dodgy irq: %x (harmless)\n",
stat & ~ack);
diff --git a/sys/dev/sound/pci/emu10kx-pcm.c b/sys/dev/sound/pci/emu10kx-pcm.c
index 0099b0f044d0..58d25d7e68c5 100644
--- a/sys/dev/sound/pci/emu10kx-pcm.c
+++ b/sys/dev/sound/pci/emu10kx-pcm.c
@@ -263,11 +263,12 @@ emu_dspmixer_uninit(struct snd_mixer *m)
/* drop submixer for AC97 codec */
sc = mix_getdevinfo(m);
- if (sc->sm != NULL)
+ if (sc->sm != NULL) {
err = mixer_delete(sc->sm);
if (err)
return (err);
sc->sm = NULL;
+ }
return (0);
}