serial: mfd: fix bug in serial_hsu_remove()
PATCH 1/1 serial: mfd: fix bug in serial_hsu_remove()
From: Feng Tang <[email protected]>
Medfield HSU driver deal with 4 pci devices(3 uart ports + 1 dma controller), so in pci remove func, we need handle them differently
Signed-off-by Feng Tang <[email protected]>
Signed-off-by Alan Cox <[email protected]>
---
drivers/serial/mfd.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-)
drivers/serial/mfd.c +9 -8
@@ -1429,7 +1429,6 @@ static void hsu_global_init(void) } phsu = hsu; -hsu_debugfs_init (hsu);return ;
@@ -1441,18 +1440,20 @@ err_free_region:static void serial_hsu_remove (struct pci_dev *pdev) { -struct hsu_port *hsu; -int i; +void *priv =pci_get_drvdata (pdev); +struct uart_hsu_port *up; - hsu =pci_get_drvdata (pdev); -if (!hsu) +if (!priv)return ; -for (i =0 ; i <3 ; i++) -uart_remove_one_port (&serial_hsu_reg, &hsu->port[i].port); +/* For port 0/1/2, priv is the address of uart_hsu_port */ +if (pdev->device !=0x081E ) { + up = priv; +uart_remove_one_port (&serial_hsu_reg, &up->port); + }pci_set_drvdata (pdev,NULL ); -free_irq (hsu->irq, hsu); +free_irq (pdev->irq, priv);pci_disable_device (pdev); }