diff options
| author |   Dinghao Liu <dinghao.liu@zju.edu.cn> | 2020-12-21 20:24:35 +0800 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-28 15:11:52 +0100 |
| commit | f31559af97a0eabd467e4719253675b7dccb8a46 (patch) | |
| tree | aa7a0fb473c4d26e35bc5e18fa05697f680464dc /drivers/staging/fwserial | |
| parent | staging: rtl8192u: Add null check in rtl8192_usb_initendpoints (diff) | |
| download | linux-dev-f31559af97a0eabd467e4719253675b7dccb8a46.tar.xz linux-dev-f31559af97a0eabd467e4719253675b7dccb8a46.zip | |
staging: fwserial: Fix error handling in fwserial_create
When fw_core_add_address_handler() fails, we need to destroy
the port by tty_port_destroy(). Also we need to unregister
the address handler by fw_core_remove_address_handler() on
failure.
Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Link: https://lore.kernel.org/r/20201221122437.10274-1-dinghao.liu@zju.edu.cn
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/fwserial')
| -rw-r--r-- | drivers/staging/fwserial/fwserial.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/fwserial/fwserial.c b/drivers/staging/fwserial/fwserial.c index db83d34cd677..c368082aae1a 100644 --- a/drivers/staging/fwserial/fwserial.c +++ b/drivers/staging/fwserial/fwserial.c @@ -2189,6 +2189,7 @@ static int fwserial_create(struct fw_unit *unit) err = fw_core_add_address_handler(&port->rx_handler, &fw_high_memory_region); if (err) { + tty_port_destroy(&port->port); kfree(port); goto free_ports; } @@ -2271,6 +2272,7 @@ unregister_ttys: free_ports: for (--i; i >= 0; --i) { + fw_core_remove_address_handler(&serial->ports[i]->rx_handler); tty_port_destroy(&serial->ports[i]->port); kfree(serial->ports[i]); } |