diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-08-24 11:16:58 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-08-24 11:16:58 -0400 |
commit | e72615f6abde92e961feee13e1078a1352cde4f7 (patch) | |
tree | 2327344aa361450be8349c74b67637ed32f070ce /drivers/net/wireless/ipw2x00/ipw2100.c | |
parent | a0dfb2634e5671770f598cda08002d8cda66ac77 (diff) | |
parent | c6b6eedc29dec8f779fd3420e8c62fd18e7b7c97 (diff) | |
download | op-kernel-dev-e72615f6abde92e961feee13e1078a1352cde4f7.zip op-kernel-dev-e72615f6abde92e961feee13e1078a1352cde4f7.tar.gz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/ipw2x00/ipw2100.c')
-rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index 95aa8e1..83324b3 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c @@ -2042,7 +2042,8 @@ static void isr_indicate_associated(struct ipw2100_priv *priv, u32 status) return; } len = ETH_ALEN; - ipw2100_get_ordinal(priv, IPW_ORD_STAT_ASSN_AP_BSSID, &bssid, &len); + ret = ipw2100_get_ordinal(priv, IPW_ORD_STAT_ASSN_AP_BSSID, bssid, + &len); if (ret) { IPW_DEBUG_INFO("failed querying ordinals at line %d\n", __LINE__); |