Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable

[mv-sheeva.git] / drivers / usb / serial / ftdi_sio.c

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 37b57c785cc730eca86e98fc4d01323d7579dc34..89a9a584780391d7ad6544440aecac540a3fc4f0 100644 (file)
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -2108,7 +2108,6 @@ static void ftdi_set_termios(struct tty_struct *tty,
                }
 
        }
-       return;
 }
 
 static int ftdi_tiocmget(struct tty_struct *tty, struct file *file)