diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ata/libata-core.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index b71a7ef3f92a..63c808d17c28 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
| @@ -315,9 +315,7 @@ int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev, | |||
| 315 | tf->flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE; | 315 | tf->flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE; |
| 316 | tf->flags |= tf_flags; | 316 | tf->flags |= tf_flags; |
| 317 | 317 | ||
| 318 | if ((dev->flags & (ATA_DFLAG_PIO | ATA_DFLAG_NCQ_OFF | | 318 | if (ata_ncq_enabled(dev) && likely(tag != ATA_TAG_INTERNAL)) { |
| 319 | ATA_DFLAG_NCQ)) == ATA_DFLAG_NCQ && | ||
| 320 | likely(tag != ATA_TAG_INTERNAL)) { | ||
| 321 | /* yay, NCQ */ | 319 | /* yay, NCQ */ |
| 322 | if (!lba_48_ok(block, n_block)) | 320 | if (!lba_48_ok(block, n_block)) |
| 323 | return -ERANGE; | 321 | return -ERANGE; |