Merge /spare/repo/linux-2.6/

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index f8ddc2a29e9a..03b7a6dd95fe 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -1537,10 +1537,10 @@ ata_scsi_find_dev(struct ata_port *ap, struct scsi_device *scsidev)
         if (unlikely(!ata_dev_present(dev)))
                 return NULL;
 
-#ifndef ATA_ENABLE_ATAPI
-        if (unlikely(dev->class == ATA_DEV_ATAPI))
-                return NULL;
-#endif
+        if (!atapi_enabled) {
+                if (unlikely(dev->class == ATA_DEV_ATAPI))
+                        return NULL;
+        }
 
         return dev;
 }