projects/linux·commit 685d87f7

Revert "pcm_native.c: remove unused label"

685d87f7 · Linus Torvalds <[email protected]> · 2008-08-06 19:24:47 -07:00

This reverts commit 680db0136e0778a0d7e025af7572c6a8d82279e2.  The label
is actually used, but hidden behind CONFIG_SND_DEBUG and the horrible
snd_assert() macro.

That macro could probably be improved to be along the lines of

	#define snd_assert(expr, args...) do { if ((void)(expr),0) { args; } } while (0)

or similar to make sure that we always both evaluate 'expr' and parse
'args', but while gcc should optimize it all away, I'm too lazy to
really verify that.  So I'll just admit defeat and will continue to live
with the annoying warning.

Noted-by: Robert P. J. Day <[email protected]>
Signed-off-by: Linus "Grr.." Torvalds
Commit
685d87f7ccc649ab92b55e18e507a65d0e694eb9
Parents
f99e8f27

Changes

1 files changed · +1 −0

FileStatusAddDelContent
sound/core/pcm_native.cmodified+1−0View file

sound/core/pcm_native.c

View file
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 333cff6..c49b9d9 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -3259,6 +3259,7 @@ static int snd_pcm_fasync(int fd, struct file * file, int on)
runtime = substream->runtime;
err = fasync_helper(fd, file, on, &runtime->fasync);
+out:
unlock_kernel();
if (err < 0)
return err;