From ff6c1dcb7c7a3770fac827a9750778ce302e6b2e Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jgarzik@pobox.com>
Date: Mon, 13 Feb 2006 00:23:57 -0500
Subject: [PATCH] --- yaml --- r: 29383 b: refs/heads/master c:
 db024d5398cd332023896caf70530564b15ec88e h: refs/heads/master i:   29381:
 499fb30fdd9579b4eaf8d38c337638b8c36db232   29379:
 1cc2cb4479339251abf7afdddea24398e88d82f5   29375:
 53a0d5885d46fde7511d5319eff94cc62cd633a7 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/scsi/libata-core.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d00c70565a51..13c74461b14a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3875e1945b55f0eb83fe7359614a801eeb716761
+refs/heads/master: db024d5398cd332023896caf70530564b15ec88e
diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c
index 5ab220e9907c..d1803c91b81f 100644
--- a/trunk/drivers/scsi/libata-core.c
+++ b/trunk/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) {