diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-12-06 16:37:24 +0100 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-12-06 16:37:24 +0100 |
commit | d86804cb70f93ca5e4c0fb13402962fbfb705c53 (patch) | |
tree | ca4e7da3541267ad909a2b73228406503e198ffa /drivers/bcma/host_pci.c | |
parent | macvlan: Support creating macvtaps from macvlans (diff) | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
download | linux-d86804cb70f93ca5e4c0fb13402962fbfb705c53.tar.xz linux-d86804cb70f93ca5e4c0fb13402962fbfb705c53.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/bcma/host_pci.c')
-rw-r--r-- | drivers/bcma/host_pci.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c index 6fb98b53533f..12a4ff751359 100644 --- a/drivers/bcma/host_pci.c +++ b/drivers/bcma/host_pci.c @@ -238,7 +238,6 @@ static void bcma_host_pci_remove(struct pci_dev *dev) pci_release_regions(dev); pci_disable_device(dev); kfree(bus); - pci_set_drvdata(dev, NULL); } #ifdef CONFIG_PM_SLEEP |