patch-1.3.95 linux/drivers/char/stallion.c

Next file: linux/drivers/char/suncons.c
Previous file: linux/drivers/char/pty.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.94/linux/drivers/char/stallion.c linux/drivers/char/stallion.c
@@ -140,7 +140,7 @@
  *	all the local structures required by a serial tty driver.
  */
 static char	*stl_drvname = "Stallion Multiport Serial Driver";
-static char	*stl_drvversion = "1.1.1";
+static char	*stl_drvversion = "1.1.3";
 static char	*stl_serialname = "ttyE";
 static char	*stl_calloutname = "cue";
 
@@ -3065,20 +3065,15 @@
 
 static int stl_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, unsigned long arg)
 {
-	stlbrd_t	*brdp;
-	int		brdnr, rc;
+	int	brdnr, rc;
 
 #if DEBUG
 	printk("stl_memioctl(ip=%x,fp=%x,cmd=%x,arg=%x)\n", (int) ip, (int) fp, cmd, (int) arg);
 #endif
 
 	brdnr = MINOR(ip->i_rdev);
-	if (brdnr >= stl_nrbrds)
-		return(-ENODEV);
-	brdp = stl_brds[brdnr];
-	if (brdp == (stlbrd_t *) NULL)
+	if (brdnr >= STL_MAXBRDS)
 		return(-ENODEV);
-
 	rc = 0;
 
 	switch (cmd) {

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this