diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 11:39:55 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 11:39:55 +0200 |
| commit | c324b44c34050cf2a9b58830e11c974806bd85d8 (patch) | |
| tree | 3ac45a783221283925cd698334a8f5e7dd4c1df8 /drivers/scsi/libata-scsi.c | |
| parent | /spare/repo/libata-dev branch 'master' (diff) | |
| parent | [SCSI] Re-do "final klist fixes" (diff) | |
| download | linux-c324b44c34050cf2a9b58830e11c974806bd85d8.tar.xz linux-c324b44c34050cf2a9b58830e11c974806bd85d8.zip | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/scsi/libata-scsi.c')
| -rw-r--r-- | drivers/scsi/libata-scsi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c index a980701d06c7..98057563a3cc 100644 --- a/drivers/scsi/libata-scsi.c +++ b/drivers/scsi/libata-scsi.c @@ -1776,10 +1776,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; } |