1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index dea314ce33d3..f3ee098b69c7 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -949,6 +949,7 @@ static void ide_port_setup_devices(ide_hwif_t *hwif)
 {
         int i;
 
+        mutex_lock(&ide_cfg_mtx);
         for (i = 0; i < MAX_DRIVES; i++) {
                 ide_drive_t *drive = &hwif->drives[i];
 
@@ -963,6 +964,7 @@ static void ide_port_setup_devices(ide_hwif_t *hwif)
 
                 ide_add_drive_to_hwgroup(drive);
         }
+        mutex_unlock(&ide_cfg_mtx);
 }
 
 /*
@@ -1088,8 +1090,6 @@ static int init_irq (ide_hwif_t *hwif)
                         hwif->sharing_irq ? "shar" : "serializ", match->name);
         printk("\n");
 
-        ide_port_setup_devices(hwif);
-
         mutex_unlock(&ide_cfg_mtx);
         return 0;
 out_unlink:
@@ -1447,6 +1447,8 @@ int ide_device_add_all(u8 *idx, const struct ide_port_info *d)
                         continue;
                 }
 
+                ide_port_setup_devices(hwif);
+
                 ide_acpi_init(hwif);
                 ide_acpi_port_init_devices(hwif);
         }