diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
| commit | 2ecf042ef530dd0943e41d84b6344f507941af3e (patch) | |
| tree | 73100361dd74e3f80f14c7c81ba4675948983f44 /drivers/ata/libata-acpi.c | |
| parent | 32a56ebb24f23da1bbaf24292acf85b6c04526ab (diff) | |
| parent | de5603748af8bf7deac403e6ba92887f8d18e812 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/ata/libata-acpi.c')
| -rw-r--r-- | drivers/ata/libata-acpi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c index 03a0acff6cfa..cb3eab6e379d 100644 --- a/drivers/ata/libata-acpi.c +++ b/drivers/ata/libata-acpi.c | |||
| @@ -489,8 +489,7 @@ static void taskfile_load_raw(struct ata_port *ap, | |||
| 489 | 489 | ||
| 490 | /* convert gtf to tf */ | 490 | /* convert gtf to tf */ |
| 491 | tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE; /* TBD */ | 491 | tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE; /* TBD */ |
| 492 | tf.protocol = atadev->class == ATA_DEV_ATAPI ? | 492 | tf.protocol = ATA_PROT_NODATA; |
| 493 | ATA_PROT_ATAPI_NODATA : ATA_PROT_NODATA; | ||
| 494 | tf.feature = gtf->tfa[0]; /* 0x1f1 */ | 493 | tf.feature = gtf->tfa[0]; /* 0x1f1 */ |
| 495 | tf.nsect = gtf->tfa[1]; /* 0x1f2 */ | 494 | tf.nsect = gtf->tfa[1]; /* 0x1f2 */ |
| 496 | tf.lbal = gtf->tfa[2]; /* 0x1f3 */ | 495 | tf.lbal = gtf->tfa[2]; /* 0x1f3 */ |