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

Commit e8b09428 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream'

parents d1397f83 e508a391

drivers/scsi/libata-scsi.c

+5 −2
Original line number Diff line number Diff line
@@ -2175,10 +2175,13 @@ ata_scsi_find_dev(struct ata_port *ap, const struct scsi_device *scsidev) 
	if (unlikely(!ata_dev_present(dev)))

		return NULL;



	if (!atapi_enabled) {

		if (unlikely(dev->class == ATA_DEV_ATAPI))

	if (!atapi_enabled || (ap->flags & ATA_FLAG_NO_ATAPI)) {

		if (unlikely(dev->class == ATA_DEV_ATAPI)) {

			printk(KERN_WARNING "ata%u(%u): WARNING: ATAPI is %s, device ignored.\n",

			       ap->id, dev->devno, atapi_enabled ? "not supported with this driver" : "disabled");

			return NULL;

		}

	}



	return dev;

}

include/linux/libata.h

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ enum { 
	ATA_FLAG_PIO_POLLING	= (1 << 9), /* use polling PIO if LLD

					     * doesn't handle PIO interrupts */

	ATA_FLAG_DEBUGMSG	= (1 << 10),

	ATA_FLAG_NO_ATAPI	= (1 << 11), /* No ATAPI support */



	ATA_QCFLAG_ACTIVE	= (1 << 1), /* cmd not yet ack'd to scsi lyer */

	ATA_QCFLAG_SG		= (1 << 3), /* have s/g table? */