Merge git://github.com/davem330/ide

* git://github.com/davem330/ide: ide-disk: Fix request requeuing
amtssp · Oct 3, 2011 · 0d61792 · 0d61792
2 parents 7fd21be + 2c8fc86
commit 0d61792
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
@@ -435,7 +435,12 @@ static int idedisk_prep_fn(struct request_queue *q, struct request *rq)
 	if (!(rq->cmd_flags & REQ_FLUSH))
 		return BLKPREP_OK;
 
-	cmd = kzalloc(sizeof(*cmd), GFP_ATOMIC);
+	if (rq->special) {
+		cmd = rq->special;
+		memset(cmd, 0, sizeof(*cmd));
+	} else {
+		cmd = kzalloc(sizeof(*cmd), GFP_ATOMIC);
+	}
 
 	/* FIXME: map struct ide_taskfile on rq->cmd[] */
 	BUG_ON(cmd == NULL);