diff options
Diffstat (limited to 'drivers/usb/serial/usb-serial.c')
| -rw-r--r-- | drivers/usb/serial/usb-serial.c | 4 | 
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index a19ed74d770..5d9b178484f 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c @@ -151,6 +151,7 @@ static void destroy_serial(struct kref *kref)  		}  	} +	usb_put_intf(serial->interface);  	usb_put_dev(serial->dev);  	kfree(serial);  } @@ -620,7 +621,7 @@ static struct usb_serial *create_serial(struct usb_device *dev,  	}  	serial->dev = usb_get_dev(dev);  	serial->type = driver; -	serial->interface = interface; +	serial->interface = usb_get_intf(interface);  	kref_init(&serial->kref);  	mutex_init(&serial->disc_mutex);  	serial->minor = SERIAL_TTY_NO_MINOR; @@ -902,6 +903,7 @@ static int usb_serial_probe(struct usb_interface *interface,  		port->port.ops = &serial_port_ops;  		port->serial = serial;  		spin_lock_init(&port->lock); +		init_waitqueue_head(&port->delta_msr_wait);  		/* Keep this for private driver use for the moment but  		   should probably go away */  		INIT_WORK(&port->work, usb_serial_port_work);  |