Index: sys/dev/ata/ata-queue.c
===================================================================
--- sys/dev/ata/ata-queue.c	(revision 227771)
+++ sys/dev/ata/ata-queue.c	(working copy)
@@ -116,6 +116,7 @@ ata_queue_request(struct ata_request *request)
 			  "WARNING - %s taskqueue timeout "
 			  "- completing request directly\n",
 			  ata_cmd2str(request));
+	    callout_drain(&request->callout);
 	    request->flags |= ATA_R_DANGER1;
 	    ata_completed(request, 0);
 	}