Merge branch 'master' into for-upstream

Conflicts:

	Documentation/ABI/testing/sysfs-bus-usb
	drivers/Makefile

1 files changed, 19 insertions, 13 deletions

diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index ae8e227f3db2..df6539712726 100644
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -154,8 +154,8 @@ static int omninet_attach(struct usb_serial *serial)
 
         od = kmalloc(sizeof(struct omninet_data), GFP_KERNEL);
         if (!od) {
-                err("%s- kmalloc(%Zd) failed.",
-                                __func__, sizeof(struct omninet_data));
+                dev_err(&port->dev, "%s- kmalloc(%Zd) failed.\n",
+                        __func__, sizeof(struct omninet_data));
                 return -ENOMEM;
         }
         usb_set_serial_port_data(port, od);
@@ -172,7 +172,7 @@ static int omninet_open(struct tty_struct *tty,
         dbg("%s - port %d", __func__, port->number);
 
         wport = serial->port[1];
-        wport->port.tty = tty;          /* FIXME */
+        tty_port_tty_set(&wport->port, tty);
 
         /* Start reading from the device */
         usb_fill_bulk_urb(port->read_urb, serial->dev,
@@ -183,8 +183,9 @@ static int omninet_open(struct tty_struct *tty,
                         omninet_read_bulk_callback, port);
         result = usb_submit_urb(port->read_urb, GFP_KERNEL);
         if (result)
-                err("%s - failed submitting read urb, error %d",
-                                                        __func__, result);
+                dev_err(&port->dev,
+                        "%s - failed submitting read urb, error %d\n",
+                        __func__, result);
         return result;
 }
 
@@ -229,9 +230,11 @@ static void omninet_read_bulk_callback(struct urb *urb)
         }
 
         if (urb->actual_length && header->oh_len) {
-                tty_insert_flip_string(port->port.tty,
-                        data + OMNINET_DATAOFFSET, header->oh_len);
-                tty_flip_buffer_push(port->port.tty);
+                struct tty_struct *tty = tty_port_tty_get(&port->port);
+                tty_insert_flip_string(tty, data + OMNINET_DATAOFFSET,
+                                                        header->oh_len);
+                tty_flip_buffer_push(tty);
+                tty_kref_put(tty);
         }
 
         /* Continue trying to always read  */
@@ -242,8 +245,9 @@ static void omninet_read_bulk_callback(struct urb *urb)
                         omninet_read_bulk_callback, port);
         result = usb_submit_urb(urb, GFP_ATOMIC);
         if (result)
-                err("%s - failed resubmitting read urb, error %d",
-                                                __func__, result);
+                dev_err(&port->dev,
+                        "%s - failed resubmitting read urb, error %d\n",
+                        __func__, result);
 
         return;
 }
@@ -296,8 +300,9 @@ static int omninet_write(struct tty_struct *tty, struct usb_serial_port *port,
         result = usb_submit_urb(wport->write_urb, GFP_ATOMIC);
         if (result) {
                 wport->write_urb_busy = 0;
-                err("%s - failed submitting write urb, error %d",
-                                                        __func__, result);
+                dev_err(&port->dev,
+                        "%s - failed submitting write urb, error %d\n",
+                        __func__, result);
         } else
                 result = count;
 
@@ -362,7 +367,8 @@ static int __init omninet_init(void)
         retval = usb_register(&omninet_driver);
         if (retval)
                 goto failed_usb_register;
-        info(DRIVER_VERSION ":" DRIVER_DESC);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
         return 0;
 failed_usb_register:
         usb_serial_deregister(&zyxel_omninet_device);