Commit 3de1b14f authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] Compile fix for macserial

From: Jeff Mahoney <jeffm@suse.com>

This patch fixes a problem with the serial conversion to tiocm[sg]et.

The paste from rs_ioctl included the command sanity checking, but there's no
command for tiocm[sg]et.  The compile ends up failing.
parent 8d5f7e27
...@@ -1790,11 +1790,8 @@ static int rs_tiocmget(struct tty_struct *tty, struct file *file) ...@@ -1790,11 +1790,8 @@ static int rs_tiocmget(struct tty_struct *tty, struct file *file)
if (serial_paranoia_check(info, tty->name, __FUNCTION__)) if (serial_paranoia_check(info, tty->name, __FUNCTION__))
return -ENODEV; return -ENODEV;
if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
(cmd != TIOCSERCONFIG) && (cmd != TIOCSERGSTRUCT)) {
if (tty->flags & (1 << TTY_IO_ERROR)) if (tty->flags & (1 << TTY_IO_ERROR))
return -EIO; return -EIO;
}
spin_lock_irqsave(&info->lock, flags); spin_lock_irqsave(&info->lock, flags);
control = info->curregs[5]; control = info->curregs[5];
...@@ -1820,11 +1817,8 @@ static int rs_tiocmset(struct tty_struct *tty, struct file *file, ...@@ -1820,11 +1817,8 @@ static int rs_tiocmset(struct tty_struct *tty, struct file *file,
if (serial_paranoia_check(info, tty->name, __FUNCTION__)) if (serial_paranoia_check(info, tty->name, __FUNCTION__))
return -ENODEV; return -ENODEV;
if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
(cmd != TIOCSERCONFIG) && (cmd != TIOCSERGSTRUCT)) {
if (tty->flags & (1 << TTY_IO_ERROR)) if (tty->flags & (1 << TTY_IO_ERROR))
return -EIO; return -EIO;
}
spin_lock_irqsave(&info->lock, flags); spin_lock_irqsave(&info->lock, flags);
if (set & TIOCM_RTS) if (set & TIOCM_RTS)
......
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