diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-16 16:57:54 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-16 16:57:54 +0100 |
| commit | 11cca3d12f03c670a6dd14004d40580918898760 (patch) | |
| tree | 495a745eaf5c44d08f8b1fb01b61733dc0e78c70 /drivers/tty/serial/8250/8250_pci.c | |
| parent | a2d6a987bfe4a2e344fae9d255200072eb082427 (diff) | |
| parent | 49def1853334396f948dcb4cedb9347abb318df5 (diff) | |
Merge 4.10-rc4 into tty-next
We want the serial/tty fixes in here as well to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/8250/8250_pci.c')
| -rw-r--r-- | drivers/tty/serial/8250/8250_pci.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c index 29198b94ef7a..f7ee4e0760e5 100644 --- a/drivers/tty/serial/8250/8250_pci.c +++ b/drivers/tty/serial/8250/8250_pci.c @@ -5647,17 +5647,15 @@ static pci_ers_result_t serial8250_io_slot_reset(struct pci_dev *dev) static void serial8250_io_resume(struct pci_dev *dev) { struct serial_private *priv = pci_get_drvdata(dev); - const struct pciserial_board *board; + struct serial_private *new; if (!priv) return; - board = priv->board; - kfree(priv); - priv = pciserial_init_ports(dev, board); - - if (!IS_ERR(priv)) { - pci_set_drvdata(dev, priv); + new = pciserial_init_ports(dev, priv->board); + if (!IS_ERR(new)) { + pci_set_drvdata(dev, new); + kfree(priv); } } |