mutex_unlock(&il->mutex);
 }
 
-static void
+static int
 il4965_setup_deferred_work(struct il_priv *il)
 {
        il->workqueue = create_singlethread_workqueue(DRV_NAME);
+       if (!il->workqueue)
+               return -ENOMEM;
 
        init_waitqueue_head(&il->wait_command_queue);
 
        timer_setup(&il->watchdog, il_bg_watchdog, 0);
 
        tasklet_setup(&il->irq_tasklet, il4965_irq_tasklet);
+
+       return 0;
 }
 
 static void
                goto out_disable_msi;
        }
 
-       il4965_setup_deferred_work(il);
+       err = il4965_setup_deferred_work(il);
+       if (err)
+               goto out_free_irq;
+
        il4965_setup_handlers(il);
 
        /*********************************************
 out_destroy_workqueue:
        destroy_workqueue(il->workqueue);
        il->workqueue = NULL;
+out_free_irq:
        free_irq(il->pci_dev->irq, il);
 out_disable_msi:
        pci_disable_msi(il->pci_dev);