diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 5ab220e9907c1deae0e9203dd170f2255b1560e8..d1803c91b81fba6b18abba7eeab7244f69ff988e 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) {