X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=fs%2Fselect.c;h=467bb1cb3ea5e0da46d7d4b305b1d7fb2c143208;hb=1b56e98990bcdbb20b9fab163654b9315bf158e8;hp=dfd5cb18c0127faeea806a29ef090ee14affc87e;hpb=16ec790938d4f356c82fab27b9a9adf4d6fe19a6;p=~andy%2Flinux

diff --git a/fs/select.c b/fs/select.c
index dfd5cb18c01..467bb1cb3ea 100644
--- a/fs/select.c
+++ b/fs/select.c
@@ -454,7 +454,7 @@ int do_select(int n, fd_set_bits *fds, struct timespec *end_time)
 					const struct file_operations *f_op;
 					f_op = f.file->f_op;
 					mask = DEFAULT_POLLMASK;
-					if (f_op && f_op->poll) {
+					if (f_op->poll) {
 						wait_key_set(wait, in, out,
 							     bit, busy_flag);
 						mask = (*f_op->poll)(f.file, wait);
@@ -761,7 +761,7 @@ static inline unsigned int do_pollfd(struct pollfd *pollfd, poll_table *pwait,
 		mask = POLLNVAL;
 		if (f.file) {
 			mask = DEFAULT_POLLMASK;
-			if (f.file->f_op && f.file->f_op->poll) {
+			if (f.file->f_op->poll) {
 				pwait->_key = pollfd->events|POLLERR|POLLHUP;
 				pwait->_key |= busy_flag;
 				mask = f.file->f_op->poll(f.file, pwait);