Merge branch 'linus' into perf/urgent

[cascardo/linux.git] / net / 9p / trans_fd.c

diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
index 3ffda1b..9321a77 100644 (file)
--- a/net/9p/trans_fd.c
+++ b/net/9p/trans_fd.c
@@ -244,10 +244,10 @@ p9_fd_poll(struct p9_client *client, struct poll_table_struct *pt)
        if (!ts)
                return -EREMOTEIO;
 
-       if (!ts->rd->f_op || !ts->rd->f_op->poll)
+       if (!ts->rd->f_op->poll)
                return -EIO;
 
-       if (!ts->wr->f_op || !ts->wr->f_op->poll)
+       if (!ts->wr->f_op->poll)
                return -EIO;
 
        ret = ts->rd->f_op->poll(ts->rd, pt);