diff options
Diffstat (limited to 'drivers/usb/serial/ipw.c')
| -rw-r--r-- | drivers/usb/serial/ipw.c | 6 | 
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c index a842025b9b5..3ac59a8a980 100644 --- a/drivers/usb/serial/ipw.c +++ b/drivers/usb/serial/ipw.c @@ -170,12 +170,13 @@ static void ipw_read_bulk_callback(struct urb *urb)  	usb_serial_debug_data(debug, &port->dev, __func__,  					urb->actual_length, data); -	tty = port->port.tty; +	tty = tty_port_tty_get(&port->port);  	if (tty && urb->actual_length) {  		tty_buffer_request_room(tty, urb->actual_length);  		tty_insert_flip_string(tty, data, urb->actual_length);  		tty_flip_buffer_push(tty);  	} +	tty_kref_put(tty);  	/* Continue trying to always read  */  	usb_fill_bulk_urb(port->read_urb, port->serial->dev, @@ -484,7 +485,8 @@ static int usb_ipw_init(void)  		usb_serial_deregister(&ipw_device);  		return retval;  	} -	info(DRIVER_DESC " " DRIVER_VERSION); +	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" +	       DRIVER_DESC "\n");  	return 0;  }  | 
