Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 267347
b: refs/heads/master
c: 53d785c
h: refs/heads/master
i:
  267345: 304e174
  267343: 996cc22
v: v3
  • Loading branch information
Dan Carpenter authored and Greg Kroah-Hartman committed Sep 29, 2011
1 parent bc9c55e commit e1329e2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 268e526b935e794386d75025577b745e6bd57f13
refs/heads/master: 53d785ccd918d571c227d459477793872676fc02
6 changes: 3 additions & 3 deletions trunk/drivers/tty/synclinkmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -4950,7 +4950,7 @@ static bool rx_get_frame(SLMP_INFO *info)

if ( debug_level >= DEBUG_LEVEL_DATA )
trace_block(info,info->rx_buf_list_ex[StartIndex].virt_addr,
min_t(int, framesize,SCABUFSIZE),0);
min_t(unsigned int, framesize, SCABUFSIZE), 0);

if (framesize) {
if (framesize > info->max_frame_size)
Expand Down Expand Up @@ -5015,14 +5015,14 @@ static void tx_load_dma_buffer(SLMP_INFO *info, const char *buf, unsigned int co
SCADESC_EX *desc_ex;

if ( debug_level >= DEBUG_LEVEL_DATA )
trace_block(info,buf, min_t(int, count,SCABUFSIZE), 1);
trace_block(info, buf, min_t(unsigned int, count, SCABUFSIZE), 1);

/* Copy source buffer to one or more DMA buffers, starting with
* the first transmit dma buffer.
*/
for(i=0;;)
{
copy_count = min_t(unsigned short,count,SCABUFSIZE);
copy_count = min_t(unsigned int, count, SCABUFSIZE);

desc = &info->tx_buf_list[i];
desc_ex = &info->tx_buf_list_ex[i];
Expand Down

0 comments on commit e1329e2

Please sign in to comment.