diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2010-05-24 17:33:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-25 11:07:02 -0400 |
commit | 4be929be34f9bdeffa40d815d32d7d60d2c7f03b (patch) | |
tree | 4d2c6e2b8ef766e565e2e050ee151de2e02081d3 /drivers/dma | |
parent | 940370fc86b920b51a34217a1facc3e9e97c2456 (diff) |
kernel-wide: replace USHORT_MAX, SHORT_MAX and SHORT_MIN with USHRT_MAX, SHRT_MAX and SHRT_MIN
- C99 knows about USHRT_MAX/SHRT_MAX/SHRT_MIN, not
USHORT_MAX/SHORT_MAX/SHORT_MIN.
- Make SHRT_MIN of type s16, not int, for consistency.
[akpm@linux-foundation.org: fix drivers/dma/timb_dma.c]
[akpm@linux-foundation.org: fix security/keys/keyring.c]
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/timb_dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/timb_dma.c b/drivers/dma/timb_dma.c index 0172fa3c7a2b..a1bf77c1993f 100644 --- a/drivers/dma/timb_dma.c +++ b/drivers/dma/timb_dma.c | |||
@@ -188,7 +188,7 @@ static void __td_unmap_descs(struct timb_dma_desc *td_desc, bool single) | |||
188 | static int td_fill_desc(struct timb_dma_chan *td_chan, u8 *dma_desc, | 188 | static int td_fill_desc(struct timb_dma_chan *td_chan, u8 *dma_desc, |
189 | struct scatterlist *sg, bool last) | 189 | struct scatterlist *sg, bool last) |
190 | { | 190 | { |
191 | if (sg_dma_len(sg) > USHORT_MAX) { | 191 | if (sg_dma_len(sg) > USHRT_MAX) { |
192 | dev_err(chan2dev(&td_chan->chan), "Too big sg element\n"); | 192 | dev_err(chan2dev(&td_chan->chan), "Too big sg element\n"); |
193 | return -EINVAL; | 193 | return -EINVAL; |
194 | } | 194 | } |