diff --git a/[refs] b/[refs]
index daafbbf36722..40d0adaf9888 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd0527ab15bfd96f04b084b1b2550f80cf151b60
+refs/heads/master: 9b917987fd16d0687afe550a02f68099419f5d43
diff --git a/trunk/drivers/scsi/isci/phy.c b/trunk/drivers/scsi/isci/phy.c
index 784c9a71333a..93a401dfbd30 100644
--- a/trunk/drivers/scsi/isci/phy.c
+++ b/trunk/drivers/scsi/isci/phy.c
@@ -242,11 +242,8 @@ scic_sds_phy_link_layer_initialization(struct scic_sds_phy *sci_phy,
 			&sci_phy->link_layer_registers->maximum_arbitration_wait_timer_timeout);
 	}
 
-	/*
-	 * Set the link layer hang detection to 500ms (0x1F4) from its default
-	 * value of 128ms.  Max value is 511 ms.
-	 */
-	writel(0x1F4, &sci_phy->link_layer_registers->link_layer_hang_detection_timeout);
+	/* Disable link layer hang detection, rely on the OS timeout for I/O timeouts. */
+	writel(0, &sci_phy->link_layer_registers->link_layer_hang_detection_timeout);
 
 	/* We can exit the initial state to the stopped state */
 	sci_change_state(&sci_phy->sm, SCI_PHY_STOPPED);