diff options
| author | Albert Lee <albertcc@tw.ibm.com> | 2006-03-25 17:39:34 +0800 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-29 17:21:53 -0500 |
| commit | 13ee4628ce68d1e54df01cc31239c8887c59e65d (patch) | |
| tree | 7d77a0b9e45b437c112d66d4968d5ae24a77e3cf /drivers | |
| parent | cf2f7689f94ee02e52d5331bc1a87421a67a882c (diff) | |
| download | lwn-13ee4628ce68d1e54df01cc31239c8887c59e65d.tar.gz lwn-13ee4628ce68d1e54df01cc31239c8887c59e65d.zip | |
[PATCH] libata-dev: Fix merge problem with upstream
Fix merge problem with upstream.
Changes:
1. add missing dev->cdb_len = 16 for ATA devices
2. use ata_pio_task instead of atapi_packet_task
Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/libata-core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index 76418289aa78..9ef5b8ab5b15 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c @@ -1299,6 +1299,7 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev, ap->id, device, dev->multi_count); } + dev->cdb_len = 16; } /* ATAPI-specific feature tests */ @@ -4288,7 +4289,7 @@ unsigned int ata_qc_issue_prot(struct ata_queued_cmd *qc) /* send cdb by polling if no cdb interrupt */ if ((!(qc->dev->flags & ATA_DFLAG_CDB_INTR)) || (qc->tf.flags & ATA_TFLAG_POLLING)) - ata_port_queue_task(ap, atapi_packet_task, ap, 0); + ata_port_queue_task(ap, ata_pio_task, ap, 0); break; case ATA_PROT_ATAPI_DMA: @@ -4300,7 +4301,7 @@ unsigned int ata_qc_issue_prot(struct ata_queued_cmd *qc) /* send cdb by polling if no cdb interrupt */ if (!(qc->dev->flags & ATA_DFLAG_CDB_INTR)) - ata_port_queue_task(ap, atapi_packet_task, ap, 0); + ata_port_queue_task(ap, ata_pio_task, ap, 0); break; default: |