From e1eb0898a9a256e3cf388e86550f266fabb74e87 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Fri, 27 Mar 2009 12:46:42 +0100 Subject: [PATCH] --- yaml --- r: 137673 b: refs/heads/master c: d364c7f50b3bb6dc77259974038567b821e2cf0a h: refs/heads/master i: 137671: 31cee76e9bbc87781ecf81edece21d629408d0a0 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-park.c | 4 ++-- trunk/drivers/ide/ide-taskfile.c | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 0a37272f8996..48ec874519ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7fedc3ca0b8fcd3350a40c42a7100a9539e6c4a +refs/heads/master: d364c7f50b3bb6dc77259974038567b821e2cf0a diff --git a/trunk/drivers/ide/ide-park.c b/trunk/drivers/ide/ide-park.c index c575900d5596..9490b446519f 100644 --- a/trunk/drivers/ide/ide-park.c +++ b/trunk/drivers/ide/ide-park.c @@ -74,11 +74,11 @@ ide_startstop_t ide_do_park_unpark(ide_drive_t *drive, struct request *rq) tf->lbal = 0x4c; tf->lbam = 0x4e; tf->lbah = 0x55; - cmd.tf_flags |= IDE_TFLAG_CUSTOM_HANDLER; + cmd.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE; } else /* cmd == REQ_UNPARK_HEADS */ tf->command = ATA_CMD_CHK_POWER; - cmd.tf_flags |= IDE_TFLAG_TF | IDE_TFLAG_DEVICE; + cmd.tf_flags |= IDE_TFLAG_CUSTOM_HANDLER; cmd.protocol = ATA_PROT_NODATA; cmd.rq = rq; diff --git a/trunk/drivers/ide/ide-taskfile.c b/trunk/drivers/ide/ide-taskfile.c index 4883aa4052ac..bbf7740d58a5 100644 --- a/trunk/drivers/ide/ide-taskfile.c +++ b/trunk/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); } }