diff --git a/[refs] b/[refs]
index 30b61b2af715..b4ecf6101e2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4eea9dc45fa7feb42e6dce32d94ea9ea4d64e40b
+refs/heads/master: 47c4f997c7bd9ab142c65950317232728b921aa0
diff --git a/trunk/drivers/scsi/stex.c b/trunk/drivers/scsi/stex.c
index ea0d82461317..92dbac03c2e5 100644
--- a/trunk/drivers/scsi/stex.c
+++ b/trunk/drivers/scsi/stex.c
@@ -1041,7 +1041,7 @@ static void stex_hard_reset(struct st_hba *hba)
 
 	for (i = 0; i < MU_MAX_DELAY_TIME; i++) {
 		pci_read_config_word(hba->pdev, PCI_COMMAND, &pci_cmd);
-		if (pci_cmd & PCI_COMMAND_MASTER)
+		if (pci_cmd != 0xffff && (pci_cmd & PCI_COMMAND_MASTER))
 			break;
 		msleep(1);
 	}