patch-2.1.48 linux/drivers/char/lp.c

• Lines: 41
• Date: Sun Aug 3 00:08:51 1997
• Orig file: v2.1.47/linux/drivers/char/lp.c
• Orig date: Sun Jul 27 12:11:00 1997

diff -u --recursive --new-file v2.1.47/linux/drivers/char/lp.c linux/drivers/char/lp.c
@@ -500,7 +500,7 @@
 	unsigned int minor = MINOR(inode->i_rdev);
 	unsigned int irq;
 
-	if ((irq = LP_IRQ(minor))) {
+	if ((irq = LP_IRQ(minor)) != PARPORT_IRQ_NONE) {
 		kfree_s(lp_table[minor].lp_buffer, LP_BUFFER_SIZE);
 		lp_table[minor].lp_buffer = NULL;
 	}
@@ -642,7 +642,7 @@
 		parport[0] = -3;
 	} else {
 		if (ints[0] == 0 || ints[1] == 0) {
-			/* disable driver on "parport=" or "parport=0" */
+			/* disable driver on "lp=" or "lp=0" */
 			parport[0] = -2;
 		} else {
 			printk(KERN_WARNING "warning: 'lp=0x%x' is deprecated, ignored\n", ints[1]);
@@ -652,19 +652,18 @@
 
 #endif
 
-int lp_wakeup(void *ref)
+void lp_wakeup(void *ref)
 {
 	struct lp_struct *lp_dev = (struct lp_struct *) ref;
 
 	if (!lp_dev->lp_wait_q)
-		return 1;	/* Wake up whom? */
+		return;	/* Wake up whom? */
 
 	/* Claim the Parport */
 	if (parport_claim(lp_dev->dev))
-		return 1;	/* Shouldn't happen */
+		return;	/* Shouldn't happen */
 
 	wake_up(&lp_dev->lp_wait_q);
-	return 0;
 }
 
 static int inline lp_searchfor(int list[], int a)