Skip to contentSkip to conversation

riscom8: previous patch did not compile

PATCH New Adam J. Richter 1 participant 1 message Sep 5, 2004 Char and misc drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 riscom8: previous patch did not compile

	linux-2.6.9-rc1-bk11/drivers/char/riscom8.c added

the patch "drivers/char/riscom8.c MIN/MAX removal", which had a typo where one of the new min_t() calls is missing the type parameter. Because both of the parameters and the result are all explicitly declared int on all architectures, I changed it to use min() rather than min_t(int, ...).

This is the third patch in bk11 that never could have compiled
anywhere. Although I am glad to see patches being integrated into the stock kernel more quickly, I would ask each submitter either

(1) check that the patch being submitted has compiled somewhere, or
(2) mention in the submission when this has not been done.

                    __     ______________ 

Adam J. Richter \ /
[email protected] | g g d r a s i l

drivers/char/riscom8.c +2 -2
@@ -1174,8 +1174,8 @@
 			}
 
 			cli();
-			c = min_t(c, min(SERIAL_XMIT_SIZE - port->xmit_cnt - 1,
-					 SERIAL_XMIT_SIZE - port->xmit_head));
+			c = min(c, min(SERIAL_XMIT_SIZE - port->xmit_cnt - 1,
+				       SERIAL_XMIT_SIZE - port->xmit_head));
 			memcpy(port->xmit_buf + port->xmit_head, tmp_buf, c);
 			port->xmit_head = (port->xmit_head + c) & (SERIAL_XMIT_SIZE-1);
 			port->xmit_cnt += c;