diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 22:22:41 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 22:22:41 -0500 |
| commit | e7fb585940a3dc87a42ebc30a62296e5cf6f9cd5 (patch) | |
| tree | 6b0290f0cb5f019b792df8580a73f0f852a4e856 /drivers/scsi/libata-scsi.c | |
| parent | 80c7af4074cbb4cb6be5d35c443ea6d5e8838a84 (diff) | |
| parent | c6329f4df2263ab5a40601a5236639e61b682f51 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi/libata-scsi.c')
| -rw-r--r-- | drivers/scsi/libata-scsi.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c index e2f298b2ade..665ce382eb2 100644 --- a/drivers/scsi/libata-scsi.c +++ b/drivers/scsi/libata-scsi.c @@ -2169,9 +2169,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; |