git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
isdn
/
hardware
/
eicon
/
istream.c
diff --git
a/drivers/isdn/hardware/eicon/istream.c
b/drivers/isdn/hardware/eicon/istream.c
index
2313966
..
18f8798
100644
(file)
--- a/
drivers/isdn/hardware/eicon/istream.c
+++ b/
drivers/isdn/hardware/eicon/istream.c
@@
-92,7
+92,7
@@
int diva_istream_write (void* context,
return (-1); /* was not able to write */
break; /* only part of message was written */
}
return (-1); /* was not able to write */
break; /* only part of message was written */
}
- to_write =
MIN
(length, DIVA_DFIFO_DATA_SZ);
+ to_write =
min
(length, DIVA_DFIFO_DATA_SZ);
if (to_write) {
a->ram_out_buffer (a,
#ifdef PLATFORM_GT_32BIT
if (to_write) {
a->ram_out_buffer (a,
#ifdef PLATFORM_GT_32BIT
@@
-176,7
+176,7
@@
int diva_istream_read (void* context,
return (-1); /* was not able to read */
break;
}
return (-1); /* was not able to read */
break;
}
- to_read =
MIN(max_length,
tmp[1]);
+ to_read =
min(max_length, (int)
tmp[1]);
if (to_read) {
a->ram_in_buffer(a,
#ifdef PLATFORM_GT_32BIT
if (to_read) {
a->ram_in_buffer(a,
#ifdef PLATFORM_GT_32BIT