Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 379e87089764..72ddba98f8fb 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -2173,9 +2173,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;