[PATCH] really fix funsoft driver

Fix void cast and re-enable on sparc.

Signed-off-by: David S. Miller <[email protected]>
Cc: Greg KH <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index c8999ae586520f4f621a56892f4818375666f3ef..2f4d303ee36f927b649cbedb37f7301e3ee564af 100644 (file)
--- 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 d3be9214c7c117c70489db857935900ad60eba9f..31501c9361b9d43c242cc4a1fc35106a4cd9f110 100644 (file)
--- 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__,