Merge commit 'v2.6.34-rc6' into core/locking

[karo-tx-linux.git] / drivers / usb / serial / omninet.c

diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index 062265038bf0cd57ec11972af1aafdfed8899aa4..89c724c0ac0a9cb3a9747f632973f5e0980677f6 100644 (file)
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -75,7 +75,7 @@ static void omninet_disconnect(struct usb_serial *serial);
 static void omninet_release(struct usb_serial *serial);
 static int omninet_attach(struct usb_serial *serial);
 
-static struct usb_device_id id_table[] = {
+static const struct usb_device_id id_table[] = {
        { USB_DEVICE(ZYXEL_VENDOR_ID, ZYXEL_OMNINET_ID) },
        { USB_DEVICE(ZYXEL_VENDOR_ID, BT_IGNITIONPRO_ID) },
        { }                                             /* Terminating entry */
@@ -218,8 +218,8 @@ static void omninet_read_bulk_callback(struct urb *urb)
 
        if (debug && header->oh_xxx != 0x30) {
                if (urb->actual_length) {
-                       printk(KERN_DEBUG __FILE__
-                                       ": omninet_read %d: ", header->oh_len);
+                       printk(KERN_DEBUG "%s: omninet_read %d: ",
+                              __FILE__, header->oh_len);
                        for (i = 0; i < (header->oh_len +
                                                OMNINET_HEADERLEN); i++)
                                printk("%.2x ", data[i]);
@@ -332,7 +332,7 @@ static void omninet_write_bulk_callback(struct urb *urb)
        struct usb_serial_port  *port   =  urb->context;
        int status = urb->status;
 
-       dbg("%s - port %0x\n", __func__, port->number);
+       dbg("%s - port %0x", __func__, port->number);
 
        port->write_urb_busy = 0;
        if (status) {