diff options
| author | David S. Miller <davem@davemloft.net> | 2010-07-19 12:38:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-19 12:38:51 -0700 |
| commit | b508998f665ee6d6a15eae11be258c3e94c33562 (patch) | |
| tree | 4233f82d716e97a874a206f6337959334286d448 /drivers/net | |
| parent | d9a9dc66eb8a8fd85c8546247e7e1d6023d0eb0f (diff) | |
| parent | 9acd56d3f2a05191ee369cbdd8c37dd547aa19b8 (diff) | |
| download | linux-b508998f665ee6d6a15eae11be258c3e94c33562.tar.gz linux-b508998f665ee6d6a15eae11be258c3e94c33562.tar.bz2 linux-b508998f665ee6d6a15eae11be258c3e94c33562.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_pci.c | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00dev.c | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c index d24dc7dc0723..972a9c3af39e 100644 --- a/drivers/net/wireless/hostap/hostap_pci.c +++ b/drivers/net/wireless/hostap/hostap_pci.c @@ -330,6 +330,7 @@ static int prism2_pci_probe(struct pci_dev *pdev, dev->irq = pdev->irq; hw_priv->mem_start = mem; + dev->base_addr = (unsigned long) mem; prism2_pci_cor_sreset(local); diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index 3ae468c4d760..f20d3eeeea7f 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c @@ -854,6 +854,11 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) BIT(NL80211_IFTYPE_WDS); /* + * Initialize configuration work. + */ + INIT_WORK(&rt2x00dev->intf_work, rt2x00lib_intf_scheduled); + + /* * Let the driver probe the device to detect the capabilities. */ retval = rt2x00dev->ops->lib->probe_hw(rt2x00dev); @@ -863,11 +868,6 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) } /* - * Initialize configuration work. - */ - INIT_WORK(&rt2x00dev->intf_work, rt2x00lib_intf_scheduled); - - /* * Allocate queue array. */ retval = rt2x00queue_allocate(rt2x00dev); |