diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 08:05:11 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 08:05:11 -0400 |
| commit | 75d8f2931a803b803cb4a850448460475c20f30b (patch) | |
| tree | 9853b9084fa55609c8e4abbc1763bc500e05da50 /fs/eventpoll.c | |
| parent | ffb690d5aa36d38d7bed7579e3f07b84ff6b3a08 (diff) | |
| parent | e93c7d1bc350189511d32cec2f0af79c30e7fa47 (diff) | |
Merge branch 'asoc-omap' into for-3.7
Diffstat (limited to 'fs/eventpoll.c')
| -rw-r--r-- | fs/eventpoll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 1c8b55670804..eedec84c1809 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c | |||
| @@ -1654,8 +1654,8 @@ SYSCALL_DEFINE1(epoll_create1, int, flags) | |||
| 1654 | error = PTR_ERR(file); | 1654 | error = PTR_ERR(file); |
| 1655 | goto out_free_fd; | 1655 | goto out_free_fd; |
| 1656 | } | 1656 | } |
| 1657 | fd_install(fd, file); | ||
| 1658 | ep->file = file; | 1657 | ep->file = file; |
| 1658 | fd_install(fd, file); | ||
| 1659 | return fd; | 1659 | return fd; |
| 1660 | 1660 | ||
| 1661 | out_free_fd: | 1661 | out_free_fd: |