diff options
author | Vasanthakumar Thiagarajan <vasanth@atheros.com> | 2009-09-09 05:55:49 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-09-09 11:25:25 -0400 |
commit | aeac355d23fb13a2082a8740ae7cf9408a71ec2c (patch) | |
tree | 831acd0d8035e29f4d72b31121a929fb28442cb4 /drivers/net/wireless/ath/ath9k/pci.c | |
parent | 4d8cd26849737e141ff0aa23fedacef4ea76ea4f (diff) |
ath9k: Store subsystem id in struct hw_version
This subsystem id will be used later to turn on the btcoex
support.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/pci.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/pci.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c index 8b288141d4c1..903dd8ad9d43 100644 --- a/drivers/net/wireless/ath/ath9k/pci.c +++ b/drivers/net/wireless/ath/ath9k/pci.c | |||
@@ -88,6 +88,7 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
88 | struct ath_softc *sc; | 88 | struct ath_softc *sc; |
89 | struct ieee80211_hw *hw; | 89 | struct ieee80211_hw *hw; |
90 | u8 csz; | 90 | u8 csz; |
91 | u16 subsysid; | ||
91 | u32 val; | 92 | u32 val; |
92 | int ret = 0; | 93 | int ret = 0; |
93 | struct ath_hw *ah; | 94 | struct ath_hw *ah; |
@@ -178,7 +179,8 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
178 | sc->mem = mem; | 179 | sc->mem = mem; |
179 | sc->bus_ops = &ath_pci_bus_ops; | 180 | sc->bus_ops = &ath_pci_bus_ops; |
180 | 181 | ||
181 | ret = ath_init_device(id->device, sc); | 182 | pci_read_config_word(pdev, PCI_SUBSYSTEM_ID, &subsysid); |
183 | ret = ath_init_device(id->device, sc, subsysid); | ||
182 | if (ret) { | 184 | if (ret) { |
183 | dev_err(&pdev->dev, "failed to initialize device\n"); | 185 | dev_err(&pdev->dev, "failed to initialize device\n"); |
184 | goto bad3; | 186 | goto bad3; |