diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 02:30:04 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 02:30:04 -0500 |
| commit | e508a391a0705f770ef1c4f1c304678b0e8e4fe8 (patch) | |
| tree | 5ba0357fb21e08e52b8e904e88ef692dc78855fb /drivers/scsi/libata-scsi.c | |
| parent | d00d598ffbba974d9045ba8b95296655fe2162c5 (diff) | |
| parent | 50630195bbdfe1ca775d94cd68a5f18bc1b717e4 (diff) | |
Merge branch 'upstream-fixes'
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 2aef41112c4..f286a6f1c0d 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; |