aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-park.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-park.c')
-rw-r--r--drivers/ide/ide-park.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/ide/ide-park.c b/drivers/ide/ide-park.c
index cddc7c778760..63c77f99a726 100644
--- a/drivers/ide/ide-park.c
+++ b/drivers/ide/ide-park.c
@@ -63,10 +63,10 @@ out:
63 63
64ide_startstop_t ide_do_park_unpark(ide_drive_t *drive, struct request *rq) 64ide_startstop_t ide_do_park_unpark(ide_drive_t *drive, struct request *rq)
65{ 65{
66 ide_task_t task; 66 struct ide_cmd cmd;
67 struct ide_taskfile *tf = &task.tf; 67 struct ide_taskfile *tf = &cmd.tf;
68 68
69 memset(&task, 0, sizeof(task)); 69 memset(&cmd, 0, sizeof(cmd));
70 if (rq->cmd[0] == REQ_PARK_HEADS) { 70 if (rq->cmd[0] == REQ_PARK_HEADS) {
71 drive->sleep = *(unsigned long *)rq->special; 71 drive->sleep = *(unsigned long *)rq->special;
72 drive->dev_flags |= IDE_DFLAG_SLEEPING; 72 drive->dev_flags |= IDE_DFLAG_SLEEPING;
@@ -75,14 +75,15 @@ ide_startstop_t ide_do_park_unpark(ide_drive_t *drive, struct request *rq)
75 tf->lbal = 0x4c; 75 tf->lbal = 0x4c;
76 tf->lbam = 0x4e; 76 tf->lbam = 0x4e;
77 tf->lbah = 0x55; 77 tf->lbah = 0x55;
78 task.tf_flags |= IDE_TFLAG_CUSTOM_HANDLER; 78 cmd.tf_flags |= IDE_TFLAG_CUSTOM_HANDLER;
79 } else /* cmd == REQ_UNPARK_HEADS */ 79 } else /* cmd == REQ_UNPARK_HEADS */
80 tf->command = ATA_CMD_CHK_POWER; 80 tf->command = ATA_CMD_CHK_POWER;
81 81
82 task.tf_flags |= IDE_TFLAG_TF | IDE_TFLAG_DEVICE; 82 cmd.tf_flags |= IDE_TFLAG_TF | IDE_TFLAG_DEVICE;
83 task.rq = rq; 83 cmd.rq = rq;
84 task.data_phase = TASKFILE_NO_DATA; 84 cmd.data_phase = TASKFILE_NO_DATA;
85 return do_rw_taskfile(drive, &task); 85
86 return do_rw_taskfile(drive, &cmd);
86} 87}
87 88
88ssize_t ide_park_show(struct device *dev, struct device_attribute *attr, 89ssize_t ide_park_show(struct device *dev, struct device_attribute *attr,