diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 12:46:41 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 12:46:41 +0100 |
| commit | e7fedc3ca0b8fcd3350a40c42a7100a9539e6c4a (patch) | |
| tree | 84cd0b58c1c37a4f14f769555ea877b0f4e44efa /drivers/ide/ide-taskfile.c | |
| parent | 041cea10a86a25b088185d07ad15d728f503f02c (diff) | |
| download | linux-e7fedc3ca0b8fcd3350a40c42a7100a9539e6c4a.tar.gz linux-e7fedc3ca0b8fcd3350a40c42a7100a9539e6c4a.tar.bz2 linux-e7fedc3ca0b8fcd3350a40c42a7100a9539e6c4a.zip | |
ide: use ide_complete_cmd() for head unload commands
Move handling of head unload commands from task_no_data_intr()
to ide_complete_cmd() and then use ide_complete_cmd() also for
head unload commands.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-taskfile.c')
| -rw-r--r-- | drivers/ide/ide-taskfile.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index c02687507682..4883aa4052ac 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c @@ -146,15 +146,7 @@ static ide_startstop_t task_no_data_intr(ide_drive_t *drive) return ide_error(drive, "task_no_data_intr", stat); } - if (custom && tf->command == ATA_CMD_IDLEIMMEDIATE) { - hwif->tp_ops->tf_read(drive, cmd); - if (tf->lbal != 0xc4) { - printk(KERN_ERR "%s: head unload failed!\n", - drive->name); - ide_tf_dump(drive->name, tf); - } else - drive->dev_flags |= IDE_DFLAG_PARKED; - } else if (custom && tf->command == ATA_CMD_SET_MULTI) + if (custom && tf->command == ATA_CMD_SET_MULTI) drive->mult_count = drive->mult_req; if (custom == 0 || tf->command == ATA_CMD_IDLEIMMEDIATE) { @@ -164,7 +156,8 @@ static ide_startstop_t task_no_data_intr(ide_drive_t *drive) if (blk_pm_request(rq)) ide_complete_pm_rq(drive, rq); else { - if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE) + if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE || + tf->command == ATA_CMD_IDLEIMMEDIATE) ide_complete_cmd(drive, cmd, stat, err); ide_complete_rq(drive, err); } |