diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-04 13:25:15 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-04 13:25:15 -0800 |
| commit | 8f56874bd7e8bee73ed6a1cf80dcec2753616262 (patch) | |
| tree | aebd15dea662ef5efd89402b8fd92fec540a98eb /drivers/net/wireless/ipw2x00/ipw2100.c | |
| parent | 47e1c323069bcef0acb8a2b48921688573f5ca63 (diff) | |
| parent | 159bcfeb9123c91f0dc885a42b6387a98192f896 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/ipw2x00/ipw2100.c')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index 6c836c892e4..17a9cb3528f 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c @@ -6573,6 +6573,16 @@ static int ipw2100_resume(struct pci_dev *pci_dev) } #endif +static void ipw2100_shutdown(struct pci_dev *pci_dev) +{ + struct ipw2100_priv *priv = pci_get_drvdata(pci_dev); + + /* Take down the device; powers it off, etc. */ + ipw2100_down(priv); + + pci_disable_device(pci_dev); +} + #define IPW2100_DEV_ID(x) { PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, x } static struct pci_device_id ipw2100_pci_id_table[] __devinitdata = { @@ -6636,6 +6646,7 @@ static struct pci_driver ipw2100_pci_driver = { .suspend = ipw2100_suspend, .resume = ipw2100_resume, #endif + .shutdown = ipw2100_shutdown, }; /** |