diff --git a/[refs] b/[refs]
index f73594005c25..c561001e64bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0b2e597d5dd8c4f3778545f65c29a9c6aba0e3a
+refs/heads/master: 69f4a513911455670d3322fb5252b437c0485707
diff --git a/trunk/drivers/scsi/stex.c b/trunk/drivers/scsi/stex.c
index 96dcbac9545e..81dd3b740daf 100644
--- a/trunk/drivers/scsi/stex.c
+++ b/trunk/drivers/scsi/stex.c
@@ -1041,7 +1041,12 @@ static void stex_hard_reset(struct st_hba *hba)
 	pci_read_config_byte(bus->self, PCI_BRIDGE_CONTROL, &pci_bctl);
 	pci_bctl |= PCI_BRIDGE_CTL_BUS_RESET;
 	pci_write_config_byte(bus->self, PCI_BRIDGE_CONTROL, pci_bctl);
-	msleep(1);
+
+	/*
+	 * 1 ms may be enough for 8-port controllers. But 16-port controllers
+	 * require more time to finish bus reset. Use 100 ms here for safety
+	 */
+	msleep(100);
 	pci_bctl &= ~PCI_BRIDGE_CTL_BUS_RESET;
 	pci_write_config_byte(bus->self, PCI_BRIDGE_CONTROL, pci_bctl);