diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-09-24 12:35:41 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-09-24 12:35:41 +1000 |
| commit | d375dac714ea6eaedfb67d547041708441f9bcbe (patch) | |
| tree | eb4eafe3d724b89b5fa9b31b2a5e3f0c520c491b /drivers/net | |
| parent | ee060464a1c2c3b0ebb2dfb3e463e5232ef4c183 (diff) | |
| parent | b0dd1b52742a65f12d457476af183260e35e66b5 (diff) | |
Merge remote-tracking branch 'file-locks/linux-next'
Conflicts:
fs/locks.c
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/tun.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index acaaf6784179..186ce541c657 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -2152,9 +2152,7 @@ static int tun_chr_fasync(int fd, struct file *file, int on) goto out; if (on) { - ret = __f_setown(file, task_pid(current), PIDTYPE_PID, 0); - if (ret) - goto out; + __f_setown(file, task_pid(current), PIDTYPE_PID, 0); tfile->flags |= TUN_FASYNC; } else tfile->flags &= ~TUN_FASYNC; |