aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-disk.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-disk.c')
-rw-r--r--drivers/ide/ide-disk.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 8f49bc0ecbf8..7b24dff17460 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -651,7 +651,7 @@ static void update_ordered(ide_drive_t *drive)
651 * not available so we don't need to recheck that. 651 * not available so we don't need to recheck that.
652 */ 652 */
653 capacity = idedisk_capacity(drive); 653 capacity = idedisk_capacity(drive);
654 barrier = ide_id_has_flush_cache(id) && !drive->noflush && 654 barrier = ata_id_flush_enabled(id) && !drive->noflush &&
655 (drive->addressing == 0 || capacity <= (1ULL << 28) || 655 (drive->addressing == 0 || capacity <= (1ULL << 28) ||
656 ide_id_has_flush_cache_ext(id)); 656 ide_id_has_flush_cache_ext(id));
657 657
@@ -678,7 +678,7 @@ static int set_wcache(ide_drive_t *drive, int arg)
678 if (arg < 0 || arg > 1) 678 if (arg < 0 || arg > 1)
679 return -EINVAL; 679 return -EINVAL;
680 680
681 if (ide_id_has_flush_cache(drive->id)) { 681 if (ata_id_flush_enabled(drive->id)) {
682 memset(&args, 0, sizeof(ide_task_t)); 682 memset(&args, 0, sizeof(ide_task_t));
683 args.tf.feature = arg ? 683 args.tf.feature = arg ?
684 SETFEATURES_WC_ON : SETFEATURES_WC_OFF; 684 SETFEATURES_WC_ON : SETFEATURES_WC_OFF;
@@ -886,7 +886,7 @@ static void idedisk_setup(ide_drive_t *drive)
886 886
887static void ide_cacheflush_p(ide_drive_t *drive) 887static void ide_cacheflush_p(ide_drive_t *drive)
888{ 888{
889 if (!drive->wcache || !ide_id_has_flush_cache(drive->id)) 889 if (!drive->wcache || ata_id_flush_enabled(drive->id) == 0)
890 return; 890 return;
891 891
892 if (do_idedisk_flushcache(drive)) 892 if (do_idedisk_flushcache(drive))