Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-omap-h63xx.git] / drivers / usb / serial / empeg.c

diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c
index 1072e847280fd88df4a5fc1f9770d5a36a051692..8a69cce40b6d0ca4c8c4837c66b8d681a0553f2d 100644 (file)
--- a/drivers/usb/serial/empeg.c
+++ b/drivers/usb/serial/empeg.c
@@ -416,7 +416,7 @@ static int  empeg_startup(struct usb_serial *serial)
        dbg("%s", __func__);
 
        if (serial->dev->actconfig->desc.bConfigurationValue != 1) {
-               err("active config #%d != 1 ??",
+               dev_err(&serial->dev->dev, "active config #%d != 1 ??\n",
                        serial->dev->actconfig->desc.bConfigurationValue);
                return -ENODEV;
        }
@@ -499,15 +499,15 @@ static int __init empeg_init(void)
                urb = usb_alloc_urb(0, GFP_KERNEL);
                write_urb_pool[i] = urb;
                if (urb == NULL) {
-                       err("No more urbs???");
+                       printk(KERN_ERR "empeg: No more urbs???\n");
                        continue;
                }
 
                urb->transfer_buffer = kmalloc(URB_TRANSFER_BUFFER_SIZE,
                                                                GFP_KERNEL);
                if (!urb->transfer_buffer) {
-                       err("%s - out of memory for urb buffers.",
-                           __func__);
+                       printk(KERN_ERR "empeg: %s - out of memory for urb "
+                              "buffers.", __func__);
                        continue;
                }
        }
@@ -519,7 +519,8 @@ static int __init empeg_init(void)
        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: