From 88bf7b391dca840f03fe25e4ff8fe6b4319fa07b Mon Sep 17 00:00:00 2001 From: David Miller Date: Wed, 10 Jan 2007 23:15:40 -0800 Subject: [PATCH] really fix funsoft driver Fix void cast and re-enable on sparc. Signed-off-by: David S. Miller Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/usb/serial/Kconfig | 2 +- drivers/usb/serial/funsoft.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig index c8999ae5865..2f4d303ee36 100644 --- a/drivers/usb/serial/Kconfig +++ b/drivers/usb/serial/Kconfig @@ -170,7 +170,7 @@ config USB_SERIAL_FTDI_SIO config USB_SERIAL_FUNSOFT tristate "USB Fundamental Software Dongle Driver" - depends on USB_SERIAL && !(SPARC || SPARC64) + depends on USB_SERIAL ---help--- Say Y here if you want to use the Fundamental Software dongle. diff --git a/drivers/usb/serial/funsoft.c b/drivers/usb/serial/funsoft.c index d3be9214c7c..31501c9361b 100644 --- a/drivers/usb/serial/funsoft.c +++ b/drivers/usb/serial/funsoft.c @@ -32,7 +32,7 @@ static int funsoft_ioctl(struct usb_serial_port *port, struct file *file, dbg("%s - port %d, cmd 0x%04x", __FUNCTION__, port->number, cmd); if (cmd == TCSETSF) { - if (user_termios_to_kernel_termios(&t, (void __user *)arg)) + if (user_termios_to_kernel_termios(&t, (struct termios __user *)arg)) return -EFAULT; dbg("%s - iflag:%x oflag:%x cflag:%x lflag:%x", __FUNCTION__, -- cgit v1.2.3-70-g09d2