patch-2.2.11 linux/arch/mips/kernel/irixioctl.c

• Lines: 32
• Date: Mon Aug 9 12:04:38 1999
• Orig file: v2.2.10/linux/arch/mips/kernel/irixioctl.c
• Orig date: Sat May 8 11:14:01 1999

diff -u --recursive --new-file v2.2.10/linux/arch/mips/kernel/irixioctl.c linux/arch/mips/kernel/irixioctl.c
@@ -1,4 +1,4 @@
-/* $Id: irixioctl.c,v 1.4 1998/03/04 12:17:41 ralf Exp $
+/* $Id: irixioctl.c,v 1.6 1999/02/06 05:12:56 adevries Exp $
  * irixioctl.c: A fucking mess...
  *
  * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
@@ -11,6 +11,7 @@
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/tty.h>
+#include <linux/file.h>
 
 #include <asm/uaccess.h>
 #include <asm/ioctl.h>
@@ -33,15 +34,13 @@
 {
 	struct file *filp;
 
-	file = fcheck(fd);
-	if(!file)
+	if(!(filp = fcheck(fd)))
 		return ((struct tty_struct *) 0);
 	if(filp->private_data) {
 		struct tty_struct *ttyp = (struct tty_struct *) filp->private_data;
 
-		if(ttyp->magic == TTY_MAGIC) {
+		if(ttyp->magic == TTY_MAGIC)
 			return ttyp;
-		}
 	}
 	return ((struct tty_struct *) 0);
 }