2 files changed, 17 insertions, 3 deletions

diff --git a/drivers/usb/misc/berry_charge.c b/drivers/usb/misc/berry_charge.c
index 60893c6c8221..b15f2fd8dab4 100644
--- a/drivers/usb/misc/berry_charge.c
+++ b/drivers/usb/misc/berry_charge.c
@@ -69,7 +69,7 @@ static int magic_charge(struct usb_device *udev)
                 return retval;
         }
 
-        dbg(&udev->dev, "Sending first magic command\n");
+        dbg(&udev->dev, "Sending second magic command\n");
         retval = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
                                  0xa2, 0x40, 0, 1, dummy_buffer, 0, 100);
         if (retval != 0) {
diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c
index 0c1d66ddb812..bc3327e3dd78 100644
--- a/drivers/usb/misc/ftdi-elan.c
+++ b/drivers/usb/misc/ftdi-elan.c
@@ -2905,17 +2905,31 @@ static int __init ftdi_elan_init(void)
 {
         int result;
         printk(KERN_INFO "driver %s built at %s on %s\n", ftdi_elan_driver.name,
-                 __TIME__, __DATE__);
+               __TIME__, __DATE__);
         init_MUTEX(&ftdi_module_lock);
         INIT_LIST_HEAD(&ftdi_static_list);
         status_queue = create_singlethread_workqueue("ftdi-status-control");
+        if (!status_queue)
+                goto err1;
         command_queue = create_singlethread_workqueue("ftdi-command-engine");
+        if (!command_queue)
+                goto err2;
         respond_queue = create_singlethread_workqueue("ftdi-respond-engine");
+        if (!respond_queue)
+                goto err3;
         result = usb_register(&ftdi_elan_driver);
         if (result)
                 printk(KERN_ERR "usb_register failed. Error number %d\n",
-                        result);
+                       result);
         return result;
+
+ err3:
+        destroy_workqueue(command_queue);
+ err2:
+        destroy_workqueue(status_queue);
+ err1:
+        printk(KERN_ERR "%s couldn't create workqueue\n", ftdi_elan_driver.name);
+        return -ENOMEM;
 }
 
 static void __exit ftdi_elan_exit(void)