openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

serial: mfd: fix bug in serial_hsu_remove() 

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 <feng.tang@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Feng Tang 2010-09-06 13:41:02 +01:00 committed by Greg Kroah-Hartman
parent 476f771cb9
commit e3671ac429
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/serial/mfd.c
View File

@ -1423,7 +1423,6 @@ static void hsu_global_init(void)
} }
phsu = hsu; phsu = hsu;
hsu_debugfs_init(hsu); hsu_debugfs_init(hsu);
return; return;
@ -1435,18 +1434,20 @@ static void hsu_global_init(void)
static void serial_hsu_remove(struct pci_dev *pdev) static void serial_hsu_remove(struct pci_dev *pdev)
{ {
struct hsu_port *hsu; void *priv = pci_get_drvdata(pdev);
int i; struct uart_hsu_port *up;
hsu = pci_get_drvdata(pdev); if (!priv)
if (!hsu)
return; return;
for (i = 0; i < 3; i++) /* For port 0/1/2, priv is the address of uart_hsu_port */
uart_remove_one_port(&serial_hsu_reg, &hsu->port[i].port); if (pdev->device != 0x081E) {
up = priv;
uart_remove_one_port(&serial_hsu_reg, &up->port);
}
pci_set_drvdata(pdev, NULL); pci_set_drvdata(pdev, NULL);
free_irq(hsu->irq, hsu); free_irq(pdev->irq, priv);
pci_disable_device(pdev); pci_disable_device(pdev);
} }