diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 18:52:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 18:52:45 -0700 |
| commit | 0a09d9a49cc4a7f65b76f848821d4a8bb7cc1230 (patch) | |
| tree | 50839e8c1d52c7c5fcd93fab6ad5a81b59135cff /drivers/ata/libata-acpi.c | |
| parent | 44ce6294d07555c3d313757105fd44b78208407f (diff) | |
| parent | e0863397cb8f3ede356ef2cb7dcdccc9956cdc6d (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
Doc Fix: remove mention of combined mode-related kernel parameters
libata: fix kernel-doc parameters
Fix pata_qdi.c probe code
pata_scc: fix compilation
sata_via: add missing PM hooks
sata_nv: fix ADMA freeze/thaw/irq_clear issues
pata_pcmcia.c: add card ident for jvc cdrom
sata_promise: SATAII-150/300 TX4 port numbering fix
sata_promise: fix another error decode regression
libata-acpi: fix _GTF command protocol for ATAPI devices
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 03a0acff6cf..cb3eab6e379 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, /* convert gtf to tf */ tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE; /* TBD */ - tf.protocol = atadev->class == ATA_DEV_ATAPI ? - ATA_PROT_ATAPI_NODATA : ATA_PROT_NODATA; + tf.protocol = ATA_PROT_NODATA; tf.feature = gtf->tfa[0]; /* 0x1f1 */ tf.nsect = gtf->tfa[1]; /* 0x1f2 */ tf.lbal = gtf->tfa[2]; /* 0x1f3 */ |