diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-14 00:50:31 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-14 00:50:31 +0200 |
| commit | 69f658e399f3d9cb9c9680afb714ba23860d7ccb (patch) | |
| tree | 13fbc42f466cb10d319514e4ddec53def8c554f6 /kernel/kcmp.c | |
| parent | 9867999f3a85b52f96ef05fca00cc8128eed01ce (diff) | |
| parent | 42f6284ae602469762ee721ec31ddfc6170e00bc (diff) | |
| download | talos-op-linux-69f658e399f3d9cb9c9680afb714ba23860d7ccb.tar.gz talos-op-linux-69f658e399f3d9cb9c9680afb714ba23860d7ccb.zip | |
Merge branch 'pm-domains' into pm-opp
Diffstat (limited to 'kernel/kcmp.c')
| -rw-r--r-- | kernel/kcmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/kcmp.c b/kernel/kcmp.c index ea34ed8bb952..055bb2962a0b 100644 --- a/kernel/kcmp.c +++ b/kernel/kcmp.c @@ -131,7 +131,7 @@ static int kcmp_epoll_target(struct task_struct *task1, if (filp_epoll) { filp_tgt = get_epoll_tfile_raw_ptr(filp_epoll, slot.tfd, slot.toff); fput(filp_epoll); - } else + } if (IS_ERR(filp_tgt)) return PTR_ERR(filp_tgt); |
