diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2014-10-07 10:14:03 (GMT) |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2014-10-07 10:14:03 (GMT) |
| commit | 3cc83f9d08a80fddf4c1e8e766eff8273f30814c (patch) | |
| tree | 831246a1b77d26d0296a84c90684e0fee0368737 /drivers/serial/usbtty.c | |
| parent | 64f41212d880f3d00c6994d973aadeec5bda1b65 (diff) | |
| parent | 6dd0e7c00bfa5ce861a72b8e4a3ef9e787306125 (diff) | |
| download | u-boot-3cc83f9d08a80fddf4c1e8e766eff8273f30814c.tar.xz | |
Merge branch 'uboot'
Diffstat (limited to 'drivers/serial/usbtty.c')
| -rw-r--r-- | drivers/serial/usbtty.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c index b030526..7fb0b92 100644 --- a/drivers/serial/usbtty.c +++ b/drivers/serial/usbtty.c @@ -475,7 +475,7 @@ static void __usbtty_puts (const char *str, int len) if (space) { write_buffer (&usbtty_output); - n = MIN (space, MIN (len, maxlen)); + n = min(space, min(len, maxlen)); buf_push (&usbtty_output, str, n); str += n; @@ -882,7 +882,7 @@ static int write_buffer (circbuf_t * buf) space_avail = current_urb->buffer_length - current_urb->actual_length; - popnum = MIN (space_avail, buf->size); + popnum = min(space_avail, buf->size); if (popnum == 0) break; |