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

Commit 056a8763 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[PATCH] Serial: No need to check for priv != NULL in remove_one

parent fbc0dc0d
Loading
Loading
Loading
Loading
+17 −20
Original line number Original line Diff line number Diff line
@@ -1766,13 +1766,11 @@ pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
static void __devexit pciserial_remove_one(struct pci_dev *dev)
static void __devexit pciserial_remove_one(struct pci_dev *dev)
{
{
	struct serial_private *priv = pci_get_drvdata(dev);
	struct serial_private *priv = pci_get_drvdata(dev);

	pci_set_drvdata(dev, NULL);

	if (priv) {
	struct pci_serial_quirk *quirk;
	struct pci_serial_quirk *quirk;
	int i;
	int i;


	pci_set_drvdata(dev, NULL);

	for (i = 0; i < priv->nr; i++)
	for (i = 0; i < priv->nr; i++)
		serial8250_unregister_port(priv->line[i]);
		serial8250_unregister_port(priv->line[i]);


@@ -1793,7 +1791,6 @@ static void __devexit pciserial_remove_one(struct pci_dev *dev)


	kfree(priv);
	kfree(priv);
}
}
}


static int pciserial_suspend_one(struct pci_dev *dev, pm_message_t state)
static int pciserial_suspend_one(struct pci_dev *dev, pm_message_t state)
{
{