diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-13 17:48:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-13 17:48:14 -0400 |
| commit | 7c22a3d853804d2716ef4f90cdd693a83819ba11 (patch) | |
| tree | b0f5f71166c85e4178d9b3658be9a2ab35591bd6 /include | |
| parent | 0cb60efd03ed82d02f44a14594714367e59e8abc (diff) | |
| parent | 97b697a11b07e2ebfa69c488132596cc5eb24119 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] LBA28/LBA48 off-by-one bug in ata.h
sata_inic162x: enable LED blinking
ata: duplicate variable sparse warning
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ata.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ata.h b/include/linux/ata.h index 1ce19c1ef0e9..8a12d718c169 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h | |||
| @@ -745,7 +745,7 @@ static inline int ata_ok(u8 status) | |||
| 745 | static inline int lba_28_ok(u64 block, u32 n_block) | 745 | static inline int lba_28_ok(u64 block, u32 n_block) |
| 746 | { | 746 | { |
| 747 | /* check the ending block number */ | 747 | /* check the ending block number */ |
| 748 | return ((block + n_block - 1) < ((u64)1 << 28)) && (n_block <= 256); | 748 | return ((block + n_block) < ((u64)1 << 28)) && (n_block <= 256); |
| 749 | } | 749 | } |
| 750 | 750 | ||
| 751 | static inline int lba_48_ok(u64 block, u32 n_block) | 751 | static inline int lba_48_ok(u64 block, u32 n_block) |