1 files changed, 5 insertions, 15 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index ddf8e4862787..4f78741692dc 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -98,8 +98,6 @@ static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
 
 unsigned int ata_print_id = 1;
 
-struct workqueue_struct *ata_aux_wq;
-
 struct ata_force_param {
         const char      *name;
         unsigned int    cbl;
@@ -5611,6 +5609,7 @@ struct ata_port *ata_port_alloc(struct ata_host *host)
         ap->msg_enable = ATA_MSG_DRV | ATA_MSG_ERR | ATA_MSG_WARN;
 #endif
 
+        mutex_init(&ap->scsi_scan_mutex);
         INIT_DELAYED_WORK(&ap->hotplug_task, ata_scsi_hotplug);
         INIT_WORK(&ap->scsi_rescan_task, ata_scsi_dev_rescan);
         INIT_LIST_HEAD(&ap->eh_done_q);
@@ -6549,29 +6548,20 @@ static int __init ata_init(void)
 
         ata_parse_force_param();
 
-        ata_aux_wq = create_singlethread_workqueue("ata_aux");
-        if (!ata_aux_wq)
-                goto fail;
-
         rc = ata_sff_init();
-        if (rc)
-                goto fail;
+        if (rc) {
+                kfree(ata_force_tbl);
+                return rc;
+        }
 
         printk(KERN_DEBUG "libata version " DRV_VERSION " loaded.\n");
         return 0;
-
-fail:
-        kfree(ata_force_tbl);
-        if (ata_aux_wq)
-                destroy_workqueue(ata_aux_wq);
-        return rc;
 }
 
 static void __exit ata_exit(void)
 {
         ata_sff_exit();
         kfree(ata_force_tbl);
-        destroy_workqueue(ata_aux_wq);
 }
 
 subsys_initcall(ata_init);