diff options
| author | Albert Lee | 2006-03-31 07:29:04 +0200 |
|---|---|---|
| committer | Jeff Garzik | 2006-03-31 17:07:06 +0200 |
| commit | 08a556db919f67e1e4d33ae8d40f7222da34d994 (patch) | |
| tree | a83cc2c32b0f9996e67c430be200fb55c24444d9 /drivers/scsi/libata-core.c | |
| parent | Merge branch 'upstream' (diff) | |
| download | kernel-qcow2-linux-08a556db919f67e1e4d33ae8d40f7222da34d994.tar.gz kernel-qcow2-linux-08a556db919f67e1e4d33ae8d40f7222da34d994.tar.xz kernel-qcow2-linux-08a556db919f67e1e4d33ae8d40f7222da34d994.zip | |
[PATCH] libata-dev: print out information for ATAPI devices with CDB interrupts
print out information for ATAPI devices with CDB interrupts
Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/scsi/libata-core.c')
| -rw-r--r-- | drivers/scsi/libata-core.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index a14187e32d0a..f18742e8d72d 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c @@ -1305,6 +1305,8 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev, /* ATAPI-specific feature tests */ else if (dev->class == ATA_DEV_ATAPI) { + char *cdb_intr_string = ""; + rc = atapi_cdb_len(id); if ((rc < 12) || (rc > ATAPI_CDB_LEN)) { printk(KERN_WARNING "ata%u: unsupported CDB len\n", ap->id); @@ -1313,13 +1315,16 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev, } dev->cdb_len = (unsigned int) rc; - if (ata_id_cdb_intr(dev->id)) + if (ata_id_cdb_intr(dev->id)) { dev->flags |= ATA_DFLAG_CDB_INTR; + cdb_intr_string = ", CDB intr"; + } /* print device info to dmesg */ if (print_info) - printk(KERN_INFO "ata%u: dev %u ATAPI, max %s\n", - ap->id, dev->devno, ata_mode_string(xfer_mask)); + printk(KERN_INFO "ata%u: dev %u ATAPI, max %s%s\n", + ap->id, dev->devno, ata_mode_string(xfer_mask), + cdb_intr_string); } ap->host->max_cmd_len = 0; |