Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 43741
b: refs/heads/master
c: 90cc301
h: refs/heads/master
i:
  43739: e474194
v: v3
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Dec 8, 2006
1 parent 1ac5f01 commit 843541b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 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: 096dcfce39f952292b019a2c42c241782c9ca226
refs/heads/master: 90cc301859ea8840634324a7f5b9680312377667
5 changes: 3 additions & 2 deletions trunk/drivers/char/cyclades.c
Original file line number Diff line number Diff line change
Expand Up @@ -1644,7 +1644,8 @@ cyz_handle_rx(struct cyclades_port *info,
char_count = rx_put - rx_get;
else
char_count = rx_put - rx_get + rx_bufsize;
if (char_count >= cy_readl(&buf_ctrl->rx_threshold)) {
if (char_count >= (int)cy_readl(&buf_ctrl->
rx_threshold)) {
cy_sched_event(info, Cy_EVENT_Z_RX_FULL);
}
#endif
Expand Down Expand Up @@ -2941,7 +2942,7 @@ static void cy_put_char(struct tty_struct *tty, unsigned char ch)
return;

CY_LOCK(info, flags);
if (info->xmit_cnt >= SERIAL_XMIT_SIZE - 1) {
if (info->xmit_cnt >= (int)(SERIAL_XMIT_SIZE - 1)) {
CY_UNLOCK(info, flags);
return;
}
Expand Down

0 comments on commit 843541b

Please sign in to comment.