summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorJeff Garzik2006-02-13 06:23:57 +0100
committerJeff Garzik2006-02-13 06:23:57 +0100
commitdb024d5398cd332023896caf70530564b15ec88e (patch)
tree3d222d99f9264fdc66e7c7ad982d33b42d566c72 /drivers/scsi
parentMerge branch 'upstream' (diff)
downloadkernel-qcow2-linux-db024d5398cd332023896caf70530564b15ec88e.tar.gz
kernel-qcow2-linux-db024d5398cd332023896caf70530564b15ec88e.tar.xz
kernel-qcow2-linux-db024d5398cd332023896caf70530564b15ec88e.zip
[libata] build fix after cdb_len move
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/libata-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 5ab220e9907c..d1803c91b81f 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -3282,9 +3282,9 @@ static void atapi_send_cdb(struct ata_port *ap, struct ata_queued_cmd *qc)
{
/* send SCSI cdb */
DPRINTK("send cdb\n");
- WARN_ON(ap->cdb_len < 12);
+ WARN_ON(qc->dev->cdb_len < 12);
- ata_data_xfer(ap, qc->cdb, ap->cdb_len, 1);
+ ata_data_xfer(ap, qc->cdb, qc->dev->cdb_len, 1);
ata_altstatus(ap); /* flush */
switch (qc->tf.protocol) {