patch-2.4.0-test3 linux/drivers/char/ip2main.c

• Lines: 33
• Date: Wed Jul 5 11:00:22 2000
• Orig file: v2.4.0-test2/linux/drivers/char/ip2main.c
• Orig date: Fri Jun 23 21:55:08 2000

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/char/ip2main.c linux/drivers/char/ip2main.c
@@ -329,7 +329,7 @@
  * selected, the board is serviced periodically to see if anything needs doing.
  */
 #define  POLL_TIMEOUT   (jiffies + 1)
-static struct timer_list PollTimer = { NULL, NULL,       0,   0, ip2_poll };
+static struct timer_list PollTimer = { {NULL, NULL},       0,   0, ip2_poll };
 //                                     next, prev, expires,data, func()
 static char  TimerOn = 0;
 
@@ -862,7 +862,7 @@
 		 */
 #ifdef	CONFIG_DEVFS_FS
 		if (!devfs_handle)
-			devfs_handle = devfs_mk_dir (NULL, "ip2", 3, NULL);
+			devfs_handle = devfs_mk_dir (NULL, "ip2", NULL);
 #endif
 
 		for( i = 0; i < IP2_MAX_BOARDS; ++i ) {
@@ -2568,10 +2568,10 @@
 	 * base. Also line nunber as such is meaningless but we use it for our
 	 * array index so it is fixed also.
 	 */
-	if ( ns.irq  	    != ip2config.irq
-	    || (int) ns.port      != ((int) pCh->pMyBord->i2eBase)
-	    || ns.baud_base != pCh->BaudBase
-	    || ns.line      != pCh->port_index ) {
+	if ( (ns.irq  	    != ip2config.irq[pCh->port_index])
+	    || ((int) ns.port      != ((int) (pCh->pMyBord->i2eBase)))
+	    || (ns.baud_base != pCh->BaudBase)
+	    || (ns.line      != pCh->port_index) ) {
 		return -EINVAL;
 	}