diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-05-12 19:20:04 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-05-12 19:20:04 -0400 |
| commit | 1540c84b5ed657ed71dce06915bba461e6b09574 (patch) | |
| tree | a449dc166800a1b0c429bb038bfc974e577eaf72 /include/linux/ata.h | |
| parent | 1a3a403aa98b0ccabeb12abd7da90d33250ea36b (diff) | |
| parent | 4640b4e7d9919e9629fe8456df94f71658431ef9 (diff) | |
Merge branch '2.6.33.4' into rt/2.6.33
Conflicts:
Makefile
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux/ata.h')
| -rw-r--r-- | include/linux/ata.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ata.h b/include/linux/ata.h index 20f31567ccee..f8bd0f92c1d8 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h | |||
| @@ -1024,8 +1024,8 @@ static inline int ata_ok(u8 status) | |||
| 1024 | 1024 | ||
| 1025 | static inline int lba_28_ok(u64 block, u32 n_block) | 1025 | static inline int lba_28_ok(u64 block, u32 n_block) |
| 1026 | { | 1026 | { |
| 1027 | /* check the ending block number */ | 1027 | /* check the ending block number: must be LESS THAN 0x0fffffff */ |
| 1028 | return ((block + n_block) < ((u64)1 << 28)) && (n_block <= 256); | 1028 | return ((block + n_block) < ((1 << 28) - 1)) && (n_block <= 256); |
| 1029 | } | 1029 | } |
| 1030 | 1030 | ||
| 1031 | static inline int lba_48_ok(u64 block, u32 n_block) | 1031 | static inline int lba_48_ok(u64 block, u32 n_block) |