summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/dev/aac/aac.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c
index 19b57e9..f225430 100644
--- a/sys/dev/aac/aac.c
+++ b/sys/dev/aac/aac.c
@@ -529,7 +529,10 @@ aac_startio(struct aac_softc *sc)
break;
/* Set a timeout for this command to be completed by the controller */
- cm->timeout_handle = timeout((timeout_t*)aac_timeout, cm, AAC_CMD_TIMEOUT * hz);
+ /* Disable this for now until the timeout queue is fixed or the driver
+ * can watch timeouts itself
+ * cm->timeout_handle = timeout((timeout_t*)aac_timeout, cm, AAC_CMD_TIMEOUT * hz);
+ */
/* try to give the command to the controller */
if (aac_start(cm) == EBUSY) {
@@ -790,7 +793,10 @@ aac_bio_complete(struct aac_command *cm)
AAC_FSAStatus status;
/* kill the timeout timer */
- untimeout((timeout_t *)aac_timeout, cm, cm->timeout_handle);
+ /* Disable this for now until the timeout queue is fixed or the driver
+ * can watch timeouts itself
+ * untimeout((timeout_t *)aac_timeout, cm, cm->timeout_handle);
+ */
/* fetch relevant status and then release the command */
bp = (struct bio *)cm->cm_private;
OpenPOWER on IntegriCloud