diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:15:39 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:15:39 -0400 |
| commit | 02b311bce9fc87987a123adc3e6a2d0a2caa70e2 (patch) | |
| tree | ba5c42ecf98de1a1a72f4bd5d94dc729ca8196c9 /drivers/ide/ide-disk.c | |
| parent | 8f0f850e240df5bea027caeb1723142c50e37e57 (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'drivers/ide/ide-disk.c')
| -rw-r--r-- | drivers/ide/ide-disk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index f712e4cfd9dc..7cf3eb023521 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c | |||
| @@ -776,7 +776,7 @@ static void update_ordered(ide_drive_t *drive) | |||
| 776 | * not available so we don't need to recheck that. | 776 | * not available so we don't need to recheck that. |
| 777 | */ | 777 | */ |
| 778 | capacity = idedisk_capacity(drive); | 778 | capacity = idedisk_capacity(drive); |
| 779 | barrier = ide_id_has_flush_cache(id) && | 779 | barrier = ide_id_has_flush_cache(id) && !drive->noflush && |
| 780 | (drive->addressing == 0 || capacity <= (1ULL << 28) || | 780 | (drive->addressing == 0 || capacity <= (1ULL << 28) || |
| 781 | ide_id_has_flush_cache_ext(id)); | 781 | ide_id_has_flush_cache_ext(id)); |
| 782 | 782 | ||