ide: use ide_complete_cmd() for REQ_UNPARK_HEADS

[deliverable/linux.git] / drivers / ide / ide-taskfile.c

diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 4883aa4052ac8dd39d0e005b9871abad60a5446f..bbf7740d58a5b59aa36151cc4286b43a8cd2060e 100644 (file)
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -149,16 +149,16 @@ static ide_startstop_t task_no_data_intr(ide_drive_t *drive)
        if (custom && tf->command == ATA_CMD_SET_MULTI)
                drive->mult_count = drive->mult_req;
 
-       if (custom == 0 || tf->command == ATA_CMD_IDLEIMMEDIATE) {
+       if (custom == 0 || tf->command == ATA_CMD_IDLEIMMEDIATE ||
+           tf->command == ATA_CMD_CHK_POWER) {
                struct request *rq = hwif->rq;
-               u8 err = ide_read_error(drive);
 
                if (blk_pm_request(rq))
                        ide_complete_pm_rq(drive, rq);
                else {
-                       if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE ||
-                           tf->command == ATA_CMD_IDLEIMMEDIATE)
-                               ide_complete_cmd(drive, cmd, stat, err);
+                       u8 err = ide_read_error(drive);
+
+                       ide_complete_cmd(drive, cmd, stat, err);
                        ide_complete_rq(drive, err);
                }
        }