Commit 752a4787 authored by Linus Torvalds's avatar Linus Torvalds

Revert "char: moxa, prevent opening unavailable ports"

This reverts commit a90b0375, which
already got fixed as commit f0e85277:
the same patch (trivial differences) got applied twice.
Requested-by: default avatarAlan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f234012f
...@@ -1189,11 +1189,6 @@ static int moxa_open(struct tty_struct *tty, struct file *filp) ...@@ -1189,11 +1189,6 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
return -ENODEV; return -ENODEV;
} }
if (port % MAX_PORTS_PER_BOARD >= brd->numPorts) {
retval = -ENODEV;
goto out_unlock;
}
ch = &brd->ports[port % MAX_PORTS_PER_BOARD]; ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
ch->port.count++; ch->port.count++;
tty->driver_data = ch; tty->driver_data = ch;
...@@ -1218,8 +1213,8 @@ static int moxa_open(struct tty_struct *tty, struct file *filp) ...@@ -1218,8 +1213,8 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
moxa_close_port(tty); moxa_close_port(tty);
} else } else
ch->port.flags |= ASYNC_NORMAL_ACTIVE; ch->port.flags |= ASYNC_NORMAL_ACTIVE;
out_unlock:
mutex_unlock(&moxa_openlock); mutex_unlock(&moxa_openlock);
return retval; return retval;
} }
......
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