Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

[safe/jmp/linux-2.6] / sound / core / pcm_native.c

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index d9b8f53..a151fb0 100644 (file)
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -3246,9 +3246,7 @@ static int snd_pcm_fasync(int fd, struct file * file, int on)
        err = fasync_helper(fd, file, on, &runtime->fasync);
 out:
        unlock_kernel();
-       if (err < 0)
-               return err;
-       return 0;
+       return err;
 }
 
 /*