Commit 0d617928 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://github.com/davem330/ide:
  ide-disk: Fix request requeuing
parents 7fd21be7 2c8fc867
...@@ -435,7 +435,12 @@ static int idedisk_prep_fn(struct request_queue *q, struct request *rq) ...@@ -435,7 +435,12 @@ static int idedisk_prep_fn(struct request_queue *q, struct request *rq)
if (!(rq->cmd_flags & REQ_FLUSH)) if (!(rq->cmd_flags & REQ_FLUSH))
return BLKPREP_OK; 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[] */ /* FIXME: map struct ide_taskfile on rq->cmd[] */
BUG_ON(cmd == NULL); BUG_ON(cmd == NULL);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment