Skip to content

L
linux-davinci-2.6.23
Commit 056a8763 authored by Russell King's avatar Russell King Committed by Russell King
Browse files
Options

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

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent fbc0dc0d
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 20 deletions
drivers/serial/8250_pci.c
View file @ 056a8763
...@@ -1766,13 +1766,11 @@ pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent) ...@@ -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]);
...@@ -1792,7 +1790,6 @@ static void __devexit pciserial_remove_one(struct pci_dev *dev) ...@@ -1792,7 +1790,6 @@ static void __devexit pciserial_remove_one(struct pci_dev *dev)
pci_disable_device(dev); pci_disable_device(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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment