[PATCH 2/3] libata-dev: Fix merge problem with upstream

[Albert Lee <albertcc@tw.ibm.com>]

Fix merge problem with upstream.

Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
---
Changes:
1. add missing dev->cdb_len = 16 for ATA devices
2. use ata_pio_task instead of atapi_packet_task

--- 001_whitespace/drivers/scsi/libata-core.c	2006-03-13 12:38:03.000000000 +0800
+++ 00_cdblen/drivers/scsi/libata-core.c	2006-03-13 12:25:40.000000000 +0800
@@ -1282,6 +1282,7 @@ static int ata_dev_configure(struct ata_
 				ap->id, device, dev->multi_count);
 		}
 
+		dev->cdb_len = 16;
 	}
 
 	/* ATAPI-specific feature tests */
@@ -4254,7 +4255,7 @@ unsigned int ata_qc_issue_prot(struct at
 		/* 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:
@@ -4266,7 +4267,7 @@ unsigned int ata_qc_issue_prot(struct at
 
 		/* 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: