aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/cyclades.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/cyclades.c')
-rw-r--r--drivers/char/cyclades.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index 7da6c3babb10..3ffa0807754c 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -1644,7 +1644,8 @@ cyz_handle_rx(struct cyclades_port *info,
1644 char_count = rx_put - rx_get; 1644 char_count = rx_put - rx_get;
1645 else 1645 else
1646 char_count = rx_put - rx_get + rx_bufsize; 1646 char_count = rx_put - rx_get + rx_bufsize;
1647 if (char_count >= cy_readl(&buf_ctrl->rx_threshold)) { 1647 if (char_count >= (int)cy_readl(&buf_ctrl->
1648 rx_threshold)) {
1648 cy_sched_event(info, Cy_EVENT_Z_RX_FULL); 1649 cy_sched_event(info, Cy_EVENT_Z_RX_FULL);
1649 } 1650 }
1650#endif 1651#endif
@@ -2941,7 +2942,7 @@ static void cy_put_char(struct tty_struct *tty, unsigned char ch)
2941 return; 2942 return;
2942 2943
2943 CY_LOCK(info, flags); 2944 CY_LOCK(info, flags);
2944 if (info->xmit_cnt >= SERIAL_XMIT_SIZE - 1) { 2945 if (info->xmit_cnt >= (int)(SERIAL_XMIT_SIZE - 1)) {
2945 CY_UNLOCK(info, flags); 2946 CY_UNLOCK(info, flags);
2946 return; 2947 return;
2947 } 2948 }