Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 29411
b: refs/heads/master
c: 08a556d
h: refs/heads/master
i:
  29409: c23c03a
  29407: e198076
v: v3
  • Loading branch information
Albert Lee authored and Jeff Garzik committed Mar 31, 2006
1 parent 0a9d8fc commit cf0c43a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4f0e7c51ae392d841be395a9c6b8d26a9fbf33d2
refs/heads/master: 08a556db919f67e1e4d33ae8d40f7222da34d994
11 changes: 8 additions & 3 deletions trunk/drivers/scsi/libata-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand Down

0 comments on commit cf0c43a

Please sign in to comment.