Commit a8ab1205 authored by Adrian Bunk's avatar Adrian Bunk Committed by Greg Kroah-Hartman

[PATCH] USB: fix 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.
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent 1e3cd4ce
...@@ -218,9 +218,9 @@ static void usb_console_write(struct console *co, const char *buf, unsigned coun ...@@ -218,9 +218,9 @@ static void usb_console_write(struct console *co, const char *buf, unsigned coun
/* pass on to the driver specific version of this function if it is available */ /* pass on to the driver specific version of this function if it is available */
if (serial->type->write) if (serial->type->write)
retval = serial->type->write(port, 0, buf, count); retval = serial->type->write(port, buf, count);
else else
retval = usb_serial_generic_write(port, 0, buf, count); retval = usb_serial_generic_write(port, buf, count);
exit: exit:
dbg("%s - return value (if we had one): %d", __FUNCTION__, retval); dbg("%s - return value (if we had one): %d", __FUNCTION__, retval);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment