diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2010-08-08 19:49:58 -0400 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-08-08 20:14:15 -0400 |
| commit | d9a145fb6e5f37b9903dea8371ab5c3e34e8e2d1 (patch) | |
| tree | e2b4bb46fa00f0ad20447e40dba6fb21a4ae0815 /fs/ncpfs | |
| parent | c9243f5bdd6637b2bb7dc254b54d9edf957ef17e (diff) | |
| parent | 45d7f32c7a43cbb9592886d38190e379e2eb2226 (diff) | |
Merge commit 'linus/master' into bkl/core
Merge reason: The staging tree has introduced the easycap
driver lately. We need the latest updates to pushdown the
bkl in its ioctl helper.
Diffstat (limited to 'fs/ncpfs')
| -rw-r--r-- | fs/ncpfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c index fa3385154023..1e634deff941 100644 --- a/fs/ncpfs/inode.c +++ b/fs/ncpfs/inode.c | |||
| @@ -728,8 +728,8 @@ out_fput: | |||
| 728 | out_bdi: | 728 | out_bdi: |
| 729 | /* 23/12/1998 Marcin Dalecki <dalecki@cs.net.pl>: | 729 | /* 23/12/1998 Marcin Dalecki <dalecki@cs.net.pl>: |
| 730 | * | 730 | * |
| 731 | * The previously used put_filp(ncp_filp); was bogous, since | 731 | * The previously used put_filp(ncp_filp); was bogus, since |
| 732 | * it doesn't proper unlocking. | 732 | * it doesn't perform proper unlocking. |
| 733 | */ | 733 | */ |
| 734 | fput(ncp_filp); | 734 | fput(ncp_filp); |
| 735 | out: | 735 | out: |