aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/omninet.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/serial/omninet.c')
-rw-r--r--drivers/usb/serial/omninet.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index c4d70b0f1e48..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)
154 154
155 od = kmalloc(sizeof(struct omninet_data), GFP_KERNEL); 155 od = kmalloc(sizeof(struct omninet_data), GFP_KERNEL);
156 if (!od) { 156 if (!od) {
157 err("%s- kmalloc(%Zd) failed.", 157 dev_err(&port->dev, "%s- kmalloc(%Zd) failed.\n",
158 __func__, sizeof(struct omninet_data)); 158 __func__, sizeof(struct omninet_data));
159 return -ENOMEM; 159 return -ENOMEM;
160 } 160 }
161 usb_set_serial_port_data(port, od); 161 usb_set_serial_port_data(port, od);
@@ -183,8 +183,9 @@ static int omninet_open(struct tty_struct *tty,
183 omninet_read_bulk_callback, port); 183 omninet_read_bulk_callback, port);
184 result = usb_submit_urb(port->read_urb, GFP_KERNEL); 184 result = usb_submit_urb(port->read_urb, GFP_KERNEL);
185 if (result) 185 if (result)
186 err("%s - failed submitting read urb, error %d", 186 dev_err(&port->dev,
187 __func__, result); 187 "%s - failed submitting read urb, error %d\n",
188 __func__, result);
188 return result; 189 return result;
189} 190}
190 191
@@ -244,8 +245,9 @@ static void omninet_read_bulk_callback(struct urb *urb)
244 omninet_read_bulk_callback, port); 245 omninet_read_bulk_callback, port);
245 result = usb_submit_urb(urb, GFP_ATOMIC); 246 result = usb_submit_urb(urb, GFP_ATOMIC);
246 if (result) 247 if (result)
247 err("%s - failed resubmitting read urb, error %d", 248 dev_err(&port->dev,
248 __func__, result); 249 "%s - failed resubmitting read urb, error %d\n",
250 __func__, result);
249 251
250 return; 252 return;
251} 253}
@@ -298,8 +300,9 @@ static int omninet_write(struct tty_struct *tty, struct usb_serial_port *port,
298 result = usb_submit_urb(wport->write_urb, GFP_ATOMIC); 300 result = usb_submit_urb(wport->write_urb, GFP_ATOMIC);
299 if (result) { 301 if (result) {
300 wport->write_urb_busy = 0; 302 wport->write_urb_busy = 0;
301 err("%s - failed submitting write urb, error %d", 303 dev_err(&port->dev,
302 __func__, result); 304 "%s - failed submitting write urb, error %d\n",
305 __func__, result);
303 } else 306 } else
304 result = count; 307 result = count;
305 308
@@ -364,7 +367,8 @@ static int __init omninet_init(void)
364 retval = usb_register(&omninet_driver); 367 retval = usb_register(&omninet_driver);
365 if (retval) 368 if (retval)
366 goto failed_usb_register; 369 goto failed_usb_register;
367 info(DRIVER_VERSION ":" DRIVER_DESC); 370 printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
371 DRIVER_DESC "\n");
368 return 0; 372 return 0;
369failed_usb_register: 373failed_usb_register:
370 usb_serial_deregister(&zyxel_omninet_device); 374 usb_serial_deregister(&zyxel_omninet_device);