diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-06 18:21:44 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-06 18:21:44 -0800 |
| commit | bb7b22840141a4fab8f232ee90d30cdf728bb032 (patch) | |
| tree | 43a92bc304db0fc53155b70f83f3dd39e62a775a /drivers/net/wireless/rt2x00/rt2x00dev.c | |
| parent | 539054a8fa5141c9a4e9ac6a86d249e3f2bdef45 (diff) | |
| parent | 66f84d6594729c866c0c03fe97159a987dad7d84 (diff) | |
| download | talos-op-linux-bb7b22840141a4fab8f232ee90d30cdf728bb032.tar.gz talos-op-linux-bb7b22840141a4fab8f232ee90d30cdf728bb032.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00dev.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index 71761b343839..73bbec58341e 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c @@ -815,6 +815,8 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) mutex_init(&rt2x00dev->csr_mutex); + set_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags); + /* * Make room for rt2x00_intf inside the per-interface * structure ieee80211_vif. @@ -871,8 +873,6 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) rt2x00leds_register(rt2x00dev); rt2x00debug_register(rt2x00dev); - set_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags); - return 0; exit: |
