Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08a556db authored by Albert Lee's avatar Albert Lee Committed by Jeff Garzik
Browse files

[PATCH] libata-dev: print out information for ATAPI devices with CDB interrupts 



print out information for ATAPI devices with CDB interrupts

Signed-off-by: default avatarAlbert Lee <albertcc@tw.ibm.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 4f0e7c51

drivers/scsi/libata-core.c

+8 −3
Original line number Diff line number Diff line
@@ -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;