diff options
Diffstat (limited to 'drivers/char/lp.c')
| -rw-r--r-- | drivers/char/lp.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/char/lp.c b/drivers/char/lp.c index caf5b5ccf..59bb0a0a2 100644 --- a/drivers/char/lp.c +++ b/drivers/char/lp.c @@ -500,7 +500,7 @@ static int lp_release(struct inode * inode, struct file * file) 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 @@ void lp_setup(char *str, int *ints) 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 @@ void lp_setup(char *str, int *ints) #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) |