From eb475033c93551965dcd135912ade1e837f14748 Mon Sep 17 00:00:00 2001 From: Ed Lin Date: Wed, 9 May 2007 20:50:37 -0800 Subject: [PATCH] --- yaml --- r: 57023 b: refs/heads/master c: 69f4a513911455670d3322fb5252b437c0485707 h: refs/heads/master i: 57021: 2276407dc3a50965cd24055ae769616b879e792e 57019: fa1943ddd9b0dc7ea28710bd77129e43ec87a02d 57015: 5ede51cf6c962fefe6f1bb2463b50baef52d18c9 57007: 3ce3e4535e9b81653fa26599273c22a73ff1b69b 56991: 06608c677c2f739a5cd9f574a46fc8bd65d8dd32 56959: 50ef9f1d05b65866f26f81f9681d464be5b13e13 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/stex.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) 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);