2 files changed, 21 insertions, 13 deletions

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 3c69822507e2..aed8b31ca561 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -590,20 +590,24 @@ static ide_proc_entry_t idedisk_proc[] = {
 static void idedisk_prepare_flush(struct request_queue *q, struct request *rq)
 {
         ide_drive_t *drive = q->queuedata;
-        ide_task_t task;
+        ide_task_t *task = kmalloc(sizeof(*task), GFP_ATOMIC);
 
-        memset(&task, 0, sizeof(task));
+        /* FIXME: map struct ide_taskfile on rq->cmd[] */
+        BUG_ON(task == NULL);
+
+        memset(task, 0, sizeof(*task));
         if (ide_id_has_flush_cache_ext(drive->id) &&
             (drive->capacity64 >= (1UL << 28)))
-                task.tf.command = WIN_FLUSH_CACHE_EXT;
+                task->tf.command = WIN_FLUSH_CACHE_EXT;
         else
-                task.tf.command = WIN_FLUSH_CACHE;
-        task.tf_flags   = IDE_TFLAG_OUT_TF | IDE_TFLAG_OUT_DEVICE;
-        task.data_phase = TASKFILE_NO_DATA;
+                task->tf.command = WIN_FLUSH_CACHE;
+        task->tf_flags   = IDE_TFLAG_OUT_TF | IDE_TFLAG_OUT_DEVICE |
+                           IDE_TFLAG_DYN;
+        task->data_phase = TASKFILE_NO_DATA;
 
         rq->cmd_type = REQ_TYPE_ATA_TASKFILE;
         rq->cmd_flags |= REQ_SOFTBARRIER;
-        rq->special = &task;
+        rq->special = task;
 }
 
 /*
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index e41383fa3a51..715379605a7b 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -361,17 +361,21 @@ void ide_end_drive_cmd (ide_drive_t *drive, u8 stat, u8 err)
         spin_unlock_irqrestore(&ide_lock, flags);
 
         if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE) {
-                ide_task_t *args = (ide_task_t *) rq->special;
+                ide_task_t *task = (ide_task_t *)rq->special;
+
                 if (rq->errors == 0)
-                        rq->errors = !OK_STAT(stat,READY_STAT,BAD_STAT);
-                        
-                if (args) {
-                        struct ide_taskfile *tf = &args->tf;
+                        rq->errors = !OK_STAT(stat, READY_STAT, BAD_STAT);
+
+                if (task) {
+                        struct ide_taskfile *tf = &task->tf;
 
                         tf->error = err;
                         tf->status = stat;
 
-                        ide_tf_read(drive, args);
+                        ide_tf_read(drive, task);
+
+                        if (task->tf_flags & IDE_TFLAG_DYN)
+                                kfree(task);
                 }
         } else if (blk_pm_request(rq)) {
                 struct request_pm_state *pm = rq->data;