diff options
Diffstat (limited to 'kernel/drivers/char/pcmcia')
| -rw-r--r-- | kernel/drivers/char/pcmcia/cm4040_cs.c | 5 | ||||
| -rw-r--r-- | kernel/drivers/char/pcmcia/synclink_cs.c | 11 |
2 files changed, 3 insertions, 13 deletions
diff --git a/kernel/drivers/char/pcmcia/cm4040_cs.c b/kernel/drivers/char/pcmcia/cm4040_cs.c index 8dd48a2be..fc061f7c2 100644 --- a/kernel/drivers/char/pcmcia/cm4040_cs.c +++ b/kernel/drivers/char/pcmcia/cm4040_cs.c @@ -532,9 +532,8 @@ static int reader_config(struct pcmcia_device *link, int devno) fail_rc = pcmcia_enable_device(link); if (fail_rc != 0) { - dev_printk(KERN_INFO, &link->dev, - "pcmcia_enable_device failed 0x%x\n", - fail_rc); + dev_info(&link->dev, "pcmcia_enable_device failed 0x%x\n", + fail_rc); goto cs_release; } diff --git a/kernel/drivers/char/pcmcia/synclink_cs.c b/kernel/drivers/char/pcmcia/synclink_cs.c index 0ea998605..45df4bf91 100644 --- a/kernel/drivers/char/pcmcia/synclink_cs.c +++ b/kernel/drivers/char/pcmcia/synclink_cs.c @@ -437,7 +437,7 @@ static int mgslpc_device_count = 0; * .text section address and breakpoint on module load. * This is useful for use with gdb and add-symbol-file command. */ -static bool break_on_load=0; +static bool break_on_load; /* * Driver major number, defaults to zero to get auto @@ -2507,15 +2507,6 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp) printk("%s(%d):mgslpc_open(%s), old ref count = %d\n", __FILE__, __LINE__, tty->driver->name, port->count); - /* If port is closing, signal caller to try again */ - if (port->flags & ASYNC_CLOSING){ - wait_event_interruptible_tty(tty, port->close_wait, - !(port->flags & ASYNC_CLOSING)); - retval = ((port->flags & ASYNC_HUP_NOTIFY) ? - -EAGAIN : -ERESTARTSYS); - goto cleanup; - } - port->low_latency = (port->flags & ASYNC_LOW_LATENCY) ? 1 : 0; spin_lock_irqsave(&info->netlock, flags); |