X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=fs%2Fcompat_ioctl.c;h=dc52e13d58e021ac5cf7951d44c66c8e8d9a4993;hb=dfd11184d894cd0a92397b25cac18831a1a6a5bc;hp=5d19acfa7c6c652a6b8134ec79507457be463216;hpb=4824b69a928b6609cfb1cf232ef32d4a8125a371;p=cascardo%2Flinux.git

diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index 5d19acfa7c6c..dc52e13d58e0 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -1583,13 +1583,13 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
 		/*FALL THROUGH*/
 
 	default:
-		if (f.file->f_op && f.file->f_op->compat_ioctl) {
+		if (f.file->f_op->compat_ioctl) {
 			error = f.file->f_op->compat_ioctl(f.file, cmd, arg);
 			if (error != -ENOIOCTLCMD)
 				goto out_fput;
 		}
 
-		if (!f.file->f_op || !f.file->f_op->unlocked_ioctl)
+		if (!f.file->f_op->unlocked_ioctl)
 			goto do_ioctl;
 		break;
 	}