diff --git a/[refs] b/[refs] index 3f26f27198b9..be4d49a0c425 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d094cbe998eb566d47552aa9d3c26c9123a7b858 +refs/heads/master: 1af3557abdef34ee036a6de4cb79e24468544b8d diff --git a/trunk/fs/sysfs/file.c b/trunk/fs/sysfs/file.c index 979e9379fb5a..b1606e07b7a3 100644 --- a/trunk/fs/sysfs/file.c +++ b/trunk/fs/sysfs/file.c @@ -446,11 +446,11 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait) if (buffer->event != atomic_read(&od->event)) goto trigger; - return 0; + return DEFAULT_POLLMASK; trigger: buffer->needs_read_fill = 1; - return POLLERR|POLLPRI; + return DEFAULT_POLLMASK|POLLERR|POLLPRI; } void sysfs_notify_dirent(struct sysfs_dirent *sd)