serdev: ttyport: enforce tty-driver open() requirement
[ Upstream commit dee7d0f3b2
]
The tty-driver open routine is mandatory, but the serdev
tty-port-controller implementation did not treat it as such and would
instead fall back to calling tty_port_open() directly.
Signed-off-by: Johan Hovold <johan@kernel.org>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
669ff2a9aa
Коммит
b59dc14b0b
|
@ -120,10 +120,10 @@ static int ttyport_open(struct serdev_controller *ctrl)
|
||||||
return PTR_ERR(tty);
|
return PTR_ERR(tty);
|
||||||
serport->tty = tty;
|
serport->tty = tty;
|
||||||
|
|
||||||
if (tty->ops->open)
|
if (!tty->ops->open)
|
||||||
tty->ops->open(serport->tty, NULL);
|
goto err_unlock;
|
||||||
else
|
|
||||||
tty_port_open(serport->port, tty, NULL);
|
tty->ops->open(serport->tty, NULL);
|
||||||
|
|
||||||
/* Bring the UART into a known 8 bits no parity hw fc state */
|
/* Bring the UART into a known 8 bits no parity hw fc state */
|
||||||
ktermios = tty->termios;
|
ktermios = tty->termios;
|
||||||
|
@ -140,6 +140,12 @@ static int ttyport_open(struct serdev_controller *ctrl)
|
||||||
|
|
||||||
tty_unlock(serport->tty);
|
tty_unlock(serport->tty);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
err_unlock:
|
||||||
|
tty_unlock(tty);
|
||||||
|
tty_release_struct(tty, serport->tty_idx);
|
||||||
|
|
||||||
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ttyport_close(struct serdev_controller *ctrl)
|
static void ttyport_close(struct serdev_controller *ctrl)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче