projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dm: Expand and complete Kconfig in drivers/
[oweals/u-boot.git]
/
drivers
/
serial
/
usbtty.c
diff --git
a/drivers/serial/usbtty.c
b/drivers/serial/usbtty.c
index b030526b6a1f51f182b1fd6a7558c641b5f0b32a..75f0ec31bbfb9a6faedeaf9cf137ea1212ceefd5 100644
(file)
--- 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);
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;
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;
space_avail =
current_urb->buffer_length -
current_urb->actual_length;
- popnum =
MIN (space_avail,
buf->size);
+ popnum =
min(space_avail, (int)
buf->size);
if (popnum == 0)
break;
if (popnum == 0)
break;