*
  *****************************************************************************/
 
-static void
+static int
 il3945_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, il3945_irq_tasklet);
+
+       return 0;
 }
 
 static void
        }
 
        il_set_rxon_channel(il, &il->bands[NL80211_BAND_2GHZ].channels[5]);
-       il3945_setup_deferred_work(il);
+       err = il3945_setup_deferred_work(il);
+       if (err)
+               goto out_remove_sysfs;
+
        il3945_setup_handlers(il);
        il_power_initialize(il);
 
 
        err = il3945_setup_mac(il);
        if (err)
-               goto out_remove_sysfs;
+               goto out_destroy_workqueue;
 
        il_dbgfs_register(il, DRV_NAME);
 
 
        return 0;
 
-out_remove_sysfs:
+out_destroy_workqueue:
        destroy_workqueue(il->workqueue);
        il->workqueue = NULL;
+out_remove_sysfs:
        sysfs_remove_group(&pdev->dev.kobj, &il3945_attribute_group);
 out_release_irq:
        free_irq(il->pci_dev->irq, il);