diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-15 15:21:48 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-15 15:21:48 -0400 |
commit | 9a410e79b552bacb4481f85618aa7333b7776ed7 (patch) | |
tree | 9a6668d9edb84710c284185d6f860c4361df6ef6 /drivers/ide/ide-disk.c | |
parent | e81a3bde13343bc36613aff8f864def7171b376a (diff) |
ide: remove IDE_TFLAG_NO_SELECT_MASK taskfile flag
Always call SELECT_MASK(..., 0) in ide_tf_load() (needs to be done
to match ide_set_irq(..., 1)) and then remove IDE_TFLAG_NO_SELECT_MASK
taskfile flag.
This change should only affect hpt366 and icside host drivers since
->maskproc(..., 0) for sgiioc4 is equivalent to ide_set_irq(..., 1).
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-disk.c')
-rw-r--r-- | drivers/ide/ide-disk.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index c5f22ef8ed24..5f49a4ae9dd8 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c | |||
@@ -198,8 +198,7 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq, | |||
198 | } | 198 | } |
199 | 199 | ||
200 | memset(&task, 0, sizeof(task)); | 200 | memset(&task, 0, sizeof(task)); |
201 | task.tf_flags = IDE_TFLAG_NO_SELECT_MASK; /* FIXME? */ | 201 | task.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE; |
202 | task.tf_flags |= (IDE_TFLAG_TF | IDE_TFLAG_DEVICE); | ||
203 | 202 | ||
204 | if (drive->select.b.lba) { | 203 | if (drive->select.b.lba) { |
205 | if (lba48) { | 204 | if (lba48) { |