diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 02:32:01 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 02:32:01 -0500 |
| commit | e8b09428482deff1a9d7a36d371acee364182ec3 (patch) | |
| tree | d6494c2681ac7f0ca0b267a8ac80f2d23102758c | |
| parent | d1397f837647d8b6b3c9253a7e713d203f3cbb26 (diff) | |
| parent | e508a391a0705f770ef1c4f1c304678b0e8e4fe8 (diff) | |
Merge branch 'upstream'
| -rw-r--r-- | drivers/scsi/libata-scsi.c | 7 | ||||
| -rw-r--r-- | include/linux/libata.h | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c index 2aef41112c43..f286a6f1c0db 100644 --- a/drivers/scsi/libata-scsi.c +++ b/drivers/scsi/libata-scsi.c @@ -2175,9 +2175,12 @@ 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; diff --git a/include/linux/libata.h b/include/linux/libata.h index b77f156e5768..596858e37cc1 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -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? */ |