]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
mxser: use port variable in mxser_set_serial_info
authorJiri Slaby <jslaby@suse.cz>
Fri, 18 Jun 2021 06:15:10 +0000 (08:15 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Jun 2021 11:10:03 +0000 (13:10 +0200)
mxser_set_serial_info already defined a local 'port' of type struct
tty_port. So use it in the code everywhere.

This eliminates some text from the code there.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210618061516.662-65-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/mxser.c

index 5dd1214508135351222517090857c6415d1bfb41..2f724b4d3f43f30d4e94337d2342d141987529ee 100644 (file)
@@ -1080,14 +1080,14 @@ static int mxser_set_serial_info(struct tty_struct *tty,
 
        if (!capable(CAP_SYS_ADMIN)) {
                if ((ss->baud_base != MXSER_BAUD_BASE) ||
-                               (close_delay != info->port.close_delay) ||
-                               (closing_wait != info->port.closing_wait) ||
-                               ((ss->flags & ~ASYNC_USR_MASK) != (info->port.flags & ~ASYNC_USR_MASK))) {
+                               (close_delay != port->close_delay) ||
+                               (closing_wait != port->closing_wait) ||
+                               ((ss->flags & ~ASYNC_USR_MASK) != (port->flags & ~ASYNC_USR_MASK))) {
                        mutex_unlock(&port->mutex);
                        return -EPERM;
                }
-               info->port.flags = ((info->port.flags & ~ASYNC_USR_MASK) |
-                               (ss->flags & ASYNC_USR_MASK));
+               port->flags = (port->flags & ~ASYNC_USR_MASK) |
+                               (ss->flags & ASYNC_USR_MASK);
        } else {
                /*
                 * OK, past this point, all the error checking has been done.