Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	fs/nfs/inode.c
	fs/super.c

Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'

1 files changed, 45 insertions, 11 deletions

diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index 8023bb7279b1..f3404e10afb4 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -202,7 +202,7 @@ static void usb_console_write(struct console *co, const char *buf, unsigned coun
         struct usb_serial *serial;
         int retval = -ENODEV;
 
-        if (!port)
+        if (!port || port->serial->dev->state == USB_STATE_NOTATTACHED)
                 return;
         serial = port->serial;
 
@@ -213,17 +213,38 @@ static void usb_console_write(struct console *co, const char *buf, unsigned coun
 
         if (!port->open_count) {
                 dbg ("%s - port not opened", __FUNCTION__);
-                goto exit;
+                return;
         }
 
-        /* pass on to the driver specific version of this function if it is available */
-        if (serial->type->write)
-                retval = serial->type->write(port, buf, count);
-        else
-                retval = usb_serial_generic_write(port, buf, count);
-
-exit:
-        dbg("%s - return value (if we had one): %d", __FUNCTION__, retval);
+        while (count) {
+                unsigned int i;
+                unsigned int lf;
+                /* search for LF so we can insert CR if necessary */
+                for (i=0, lf=0 ; i < count ; i++) {
+                        if (*(buf + i) == 10) {
+                                lf = 1;
+                                i++;
+                                break;
+                        }
+                }
+                /* pass on to the driver specific version of this function if it is available */
+                if (serial->type->write)
+                        retval = serial->type->write(port, buf, i);
+                else
+                        retval = usb_serial_generic_write(port, buf, i);
+                dbg("%s - return value : %d", __FUNCTION__, retval);
+                if (lf) {
+                        /* append CR after LF */
+                        unsigned char cr = 13;
+                        if (serial->type->write)
+                                retval = serial->type->write(port, &cr, 1);
+                        else
+                                retval = usb_serial_generic_write(port, &cr, 1);
+                        dbg("%s - return value : %d", __FUNCTION__, retval);
+                }
+                buf += i;
+                count -= i;
+        }
 }
 
 static struct console usbcons = {
@@ -234,6 +255,14 @@ static struct console usbcons = {
         .index =        -1,
 };
 
+void usb_serial_console_disconnect(struct usb_serial *serial)
+{
+        if (serial && serial->port && serial->port[0] && serial->port[0] == usbcons_info.port) {
+                usb_serial_console_exit();
+                usb_serial_put(serial);
+        }
+}
+
 void usb_serial_console_init (int serial_debug, int minor)
 {
         debug = serial_debug;
@@ -259,6 +288,11 @@ void usb_serial_console_init (int serial_debug, int minor)
 
 void usb_serial_console_exit (void)
 {
-        unregister_console(&usbcons);
+        if (usbcons_info.port) {
+                unregister_console(&usbcons);
+                if (usbcons_info.port->open_count)
+                        usbcons_info.port->open_count--;
+                usbcons_info.port = NULL;
+        }
 }