diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-28 00:36:39 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-28 00:36:39 -0400 |
| commit | d35cc56ddfc948d8df1aa6d41ac345fcec01854d (patch) | |
| tree | 7e23a0e3dde639236e019aa88309d919941958e5 /fs/kernfs/file.c | |
| parent | 86d56134f1b67d0c18025ba5cade95c048ed528d (diff) | |
| parent | d1db0eea852497762cab43b905b879dfcd3b8987 (diff) | |
Merge 3.15-rc3 into staging-next
Diffstat (limited to 'fs/kernfs/file.c')
| -rw-r--r-- | fs/kernfs/file.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c index 98bacd9ea7fd..40251cd741a0 100644 --- a/fs/kernfs/file.c +++ b/fs/kernfs/file.c | |||
| @@ -485,6 +485,8 @@ static int kernfs_fop_mmap(struct file *file, struct vm_area_struct *vma) | |||
| 485 | 485 | ||
| 486 | ops = kernfs_ops(of->kn); | 486 | ops = kernfs_ops(of->kn); |
| 487 | rc = ops->mmap(of, vma); | 487 | rc = ops->mmap(of, vma); |
| 488 | if (rc) | ||
| 489 | goto out_put; | ||
| 488 | 490 | ||
| 489 | /* | 491 | /* |
| 490 | * PowerPC's pci_mmap of legacy_mem uses shmem_zero_setup() | 492 | * PowerPC's pci_mmap of legacy_mem uses shmem_zero_setup() |