lkml.org 
[lkml]   [2004]   [Oct]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[patch] 2.6.9-mm1: usb/serial/console.c compile error

The following compile error seems to come from Linus' tree:


<-- snip -->

...
CC drivers/usb/serial/bus.o
CC drivers/usb/serial/console.o
drivers/usb/serial/console.c: In function `usb_console_write':
drivers/usb/serial/console.c:221: warning: passing arg 3 of pointer to function makes integer from pointer without a cast
drivers/usb/serial/console.c:221: error: too many arguments to function
drivers/usb/serial/console.c:223: warning: passing arg 3 of `usb_serial_generic_write' makes integer from pointer without a cast
drivers/usb/serial/console.c:223: error: too many arguments to function `usb_serial_generic_write'
make[3]: *** [drivers/usb/serial/console.o] Error 1

<-- snip -->


This was caused by the changed "write" in usb_serial_device_type.


Is the following patch correct?


Signed-off-by: Adrian Bunk <bunk@stusta.de>

--- linux-2.6.9-mm1-full/drivers/usb/serial/console.c.old 2004-10-22 15:12:36.000000000 +0200
+++ linux-2.6.9-mm1-full/drivers/usb/serial/console.c 2004-10-22 15:12:59.000000000 +0200
@@ -218,9 +218,9 @@

/* pass on to the driver specific version of this function if it is available */
if (serial->type->write)
- retval = serial->type->write(port, 0, buf, count);
+ retval = serial->type->write(port, buf, count);
else
- retval = usb_serial_generic_write(port, 0, buf, count);
+ retval = usb_serial_generic_write(port, buf, count);

exit:
dbg("%s - return value (if we had one): %d", __FUNCTION__, retval);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 14:07    [W:0.629 / U:24.528 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site