Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3671ac4 authored by Feng Tang's avatar Feng Tang Committed by Greg Kroah-Hartman
Browse files

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: default avatarFeng Tang <feng.tang@intel.com>
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 476f771c

drivers/serial/mfd.c

+9 −8
Original line number Diff line number Diff line
@@ -1423,7 +1423,6 @@ static void hsu_global_init(void) 
	}



	phsu = hsu;



	hsu_debugfs_init(hsu);

	return;
@@ -1435,18 +1434,20 @@ static void hsu_global_init(void) 


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);

}