X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=drivers%2Fusb%2Fserial%2Fconsole.c;h=43a862a90a77592eda9eab2aa75be90a69981ffc;hb=96b0e525af62eb3dcc084b091b40add082467150;hp=fdf89800ebc3fca8fd90ecac58c15cde813cb265;hpb=02a2cad8e83817524cd4e14fc1c68c8c94768723;p=sfrench%2Fcifs-2.6.git

diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index fdf89800ebc3..43a862a90a77 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -186,6 +186,7 @@ static int usb_console_setup(struct console *co, char *options)
 	tty_kref_put(tty);
  reset_open_count:
 	port->port.count = 0;
+	info->port = NULL;
 	usb_autopm_put_interface(serial->interface);
  error_get_interface:
 	usb_serial_put(serial);
@@ -265,7 +266,7 @@ static struct console usbcons = {
 
 void usb_serial_console_disconnect(struct usb_serial *serial)
 {
-	if (serial->port[0] == usbcons_info.port) {
+	if (serial->port[0] && serial->port[0] == usbcons_info.port) {
 		usb_serial_console_exit();
 		usb_serial_put(serial);
 	}