diff options
Diffstat (limited to 'drivers')
-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, | |||
1305 | 1305 | ||
1306 | /* ATAPI-specific feature tests */ | 1306 | /* ATAPI-specific feature tests */ |
1307 | else if (dev->class == ATA_DEV_ATAPI) { | 1307 | else if (dev->class == ATA_DEV_ATAPI) { |
1308 | char *cdb_intr_string = ""; | ||
1309 | |||
1308 | rc = atapi_cdb_len(id); | 1310 | rc = atapi_cdb_len(id); |
1309 | if ((rc < 12) || (rc > ATAPI_CDB_LEN)) { | 1311 | if ((rc < 12) || (rc > ATAPI_CDB_LEN)) { |
1310 | printk(KERN_WARNING "ata%u: unsupported CDB len\n", ap->id); | 1312 | 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, | |||
1313 | } | 1315 | } |
1314 | dev->cdb_len = (unsigned int) rc; | 1316 | dev->cdb_len = (unsigned int) rc; |
1315 | 1317 | ||
1316 | if (ata_id_cdb_intr(dev->id)) | 1318 | if (ata_id_cdb_intr(dev->id)) { |
1317 | dev->flags |= ATA_DFLAG_CDB_INTR; | 1319 | dev->flags |= ATA_DFLAG_CDB_INTR; |
1320 | cdb_intr_string = ", CDB intr"; | ||
1321 | } | ||
1318 | 1322 | ||
1319 | /* print device info to dmesg */ | 1323 | /* print device info to dmesg */ |
1320 | if (print_info) | 1324 | if (print_info) |
1321 | printk(KERN_INFO "ata%u: dev %u ATAPI, max %s\n", | 1325 | printk(KERN_INFO "ata%u: dev %u ATAPI, max %s%s\n", |
1322 | ap->id, dev->devno, ata_mode_string(xfer_mask)); | 1326 | ap->id, dev->devno, ata_mode_string(xfer_mask), |
1327 | cdb_intr_string); | ||
1323 | } | 1328 | } |
1324 | 1329 | ||
1325 | ap->host->max_cmd_len = 0; | 1330 | ap->host->max_cmd_len = 0; |