rk: revert 20f3d0b+v3.0.66 to v3.0

[firefly-linux-kernel-4.4.55.git] / drivers / tty / serial / jsm / jsm_driver.c

diff --git a/drivers/tty/serial/jsm/jsm_driver.c b/drivers/tty/serial/jsm/jsm_driver.c
index 6c12d94e6d3fe40c06dc3742bc312037044e754d..96da17868cf3c46bad25d743c4a304e37fca2c30 100644 (file)
--- a/drivers/tty/serial/jsm/jsm_driver.c
+++ b/drivers/tty/serial/jsm/jsm_driver.c
@@ -211,6 +211,7 @@ static void __devexit jsm_remove_one(struct pci_dev *pdev)
                if (brd->channels[i]) {
                        kfree(brd->channels[i]->ch_rqueue);
                        kfree(brd->channels[i]->ch_equeue);
+                       kfree(brd->channels[i]->ch_wqueue);
                        kfree(brd->channels[i]);
                }
        }
@@ -269,7 +270,6 @@ static void jsm_io_resume(struct pci_dev *pdev)
        struct jsm_board *brd = pci_get_drvdata(pdev);
 
        pci_restore_state(pdev);
-       pci_save_state(pdev);
 
        jsm_uart_port_init(brd);
 }