v1.2.0

closes #66 (apply mail)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07d50a882b97f5bf3454ad8608c4d97055b98ec0..ea9428a2a49ddf50ec7a5364c93efc1618bdd27f 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Changelog
 
-## master / 2015-02-07
+## v1.2.0 / 2015-02-08
 
+* inotify: use epoll to wake up readEvents [#66](https://github.com/go-fsnotify/fsnotify/pull/66) (thanks @PieterD)
 * inotify: closing watcher should now always shut down goroutine [#63](https://github.com/go-fsnotify/fsnotify/pull/63) (thanks @PieterD)
 * kqueue: close kqueue after removing watches, fixes [#59](https://github.com/go-fsnotify/fsnotify/issues/59)
 

diff --git a/inotify_poller.go b/inotify_poller.go
index 029c199c294e3e9c5b511d45f913b46c8309be6f..3b4178404196ed7ec4151a5efb814308974aac21 100644 (file)
--- a/inotify_poller.go
+++ b/inotify_poller.go
@@ -28,7 +28,8 @@ func emptyPoller(fd int) *fdPoller {
 
 // Create a new inotify poller.
 // This creates an inotify handler, and an epoll handler.
-func newFdPoller(fd int) (_ *fdPoller, errno error) {
+func newFdPoller(fd int) (*fdPoller, error) {
+       var errno error
        poller := emptyPoller(fd)
        defer func() {
                if errno != nil {