diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/core/control.c | 7 | ||||
-rw-r--r-- | sound/core/pcm_native.c | 4 | ||||
-rw-r--r-- | sound/core/timer.c | 6 |
3 files changed, 4 insertions, 13 deletions
diff --git a/sound/core/control.c b/sound/core/control.c index 636b3b52ef8b..4b20fa2b7e6d 100644 --- a/sound/core/control.c +++ b/sound/core/control.c | |||
@@ -1373,12 +1373,9 @@ EXPORT_SYMBOL(snd_ctl_unregister_ioctl_compat); | |||
1373 | static int snd_ctl_fasync(int fd, struct file * file, int on) | 1373 | static int snd_ctl_fasync(int fd, struct file * file, int on) |
1374 | { | 1374 | { |
1375 | struct snd_ctl_file *ctl; | 1375 | struct snd_ctl_file *ctl; |
1376 | int err; | 1376 | |
1377 | ctl = file->private_data; | 1377 | ctl = file->private_data; |
1378 | err = fasync_helper(fd, file, on, &ctl->fasync); | 1378 | return fasync_helper(fd, file, on, &ctl->fasync); |
1379 | if (err < 0) | ||
1380 | return err; | ||
1381 | return 0; | ||
1382 | } | 1379 | } |
1383 | 1380 | ||
1384 | /* | 1381 | /* |
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index a789efc9df39..a75c194e629e 100644 --- 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) | |||
3246 | err = fasync_helper(fd, file, on, &runtime->fasync); | 3246 | err = fasync_helper(fd, file, on, &runtime->fasync); |
3247 | out: | 3247 | out: |
3248 | unlock_kernel(); | 3248 | unlock_kernel(); |
3249 | if (err < 0) | 3249 | return err; |
3250 | return err; | ||
3251 | return 0; | ||
3252 | } | 3250 | } |
3253 | 3251 | ||
3254 | /* | 3252 | /* |
diff --git a/sound/core/timer.c b/sound/core/timer.c index 796532081e81..3f0050d0b71e 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c | |||
@@ -1825,13 +1825,9 @@ static long snd_timer_user_ioctl(struct file *file, unsigned int cmd, | |||
1825 | static int snd_timer_user_fasync(int fd, struct file * file, int on) | 1825 | static int snd_timer_user_fasync(int fd, struct file * file, int on) |
1826 | { | 1826 | { |
1827 | struct snd_timer_user *tu; | 1827 | struct snd_timer_user *tu; |
1828 | int err; | ||
1829 | 1828 | ||
1830 | tu = file->private_data; | 1829 | tu = file->private_data; |
1831 | err = fasync_helper(fd, file, on, &tu->fasync); | 1830 | return fasync_helper(fd, file, on, &tu->fasync); |
1832 | if (err < 0) | ||
1833 | return err; | ||
1834 | return 0; | ||
1835 | } | 1831 | } |
1836 | 1832 | ||
1837 | static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, | 1833 | static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, |