projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
[cascardo/linux.git]
/
drivers
/
net
/
ethernet
/
dec
/
tulip
/
winbond-840.c
diff --git
a/drivers/net/ethernet/dec/tulip/winbond-840.c
b/drivers/net/ethernet/dec/tulip/winbond-840.c
index
c7b04ec
..
62fe512
100644
(file)
--- a/
drivers/net/ethernet/dec/tulip/winbond-840.c
+++ b/
drivers/net/ethernet/dec/tulip/winbond-840.c
@@
-468,7
+468,6
@@
static int w840_probe1(struct pci_dev *pdev, const struct pci_device_id *ent)
return 0;
err_out_cleardev:
- pci_set_drvdata(pdev, NULL);
pci_iounmap(pdev, ioaddr);
err_out_free_res:
pci_release_regions(pdev);
@@
-1542,8
+1541,6
@@
static void w840_remove1(struct pci_dev *pdev)
pci_iounmap(pdev, np->base_addr);
free_netdev(dev);
}
-
- pci_set_drvdata(pdev, NULL);
}
#ifdef CONFIG_PM