diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-10-15 04:14:01 +0400 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-10-15 04:14:01 +0400 |
| commit | 07aaae44f5a3962c3a410a6dd7936dfa7dece2b9 (patch) | |
| tree | 0cdb5735800ddd63d8850aa26d3a3f1f3334267a /drivers/ide/ide-disk.c | |
| parent | 07a062140372187642003e02a49edc8a2115c1ca (diff) | |
| parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
| download | linux-07aaae44f5a3962c3a410a6dd7936dfa7dece2b9.tar.xz | |
Merge commit 'v3.1-rc9' into fbdev-next
Diffstat (limited to 'drivers/ide/ide-disk.c')
| -rw-r--r-- | drivers/ide/ide-disk.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index 274798068a54..16f69be820c7 100644 --- 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); |