Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[pandora-kernel.git] / drivers / char / mxser_new.c

diff --git a/drivers/char/mxser_new.c b/drivers/char/mxser_new.c
index d52ecff..9af07e4 100644 (file)
--- a/drivers/char/mxser_new.c
+++ b/drivers/char/mxser_new.c
@@ -1708,7 +1708,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file,
 
                info->speed = speed;
                spin_lock_irqsave(&info->slock, flags);
-               mxser_change_speed(info, 0);
+               mxser_change_speed(info, NULL);
                spin_unlock_irqrestore(&info->slock, flags);
 
                return 0;