xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Browse Source
This commit is contained in:
John W. Linville
2010-05-17 13:57:43 -04:00
parent 278554bd65 0c348d7c14
commit 6fe70aae0d
60 changed files with 2161 additions and 1451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/wl12xx/wl1271_main.c
View File

@@ -467,6 +467,7 @@ static void wl1271_irq_work(struct work_struct *work)
intr = le32_to_cpu(wl->fw_status->intr);
if (!intr) {
wl1271_debug(DEBUG_IRQ, "Zero interrupt received.");
spin_lock_irqsave(&wl->wl_lock, flags);
continue;
}
@@ -852,7 +853,7 @@ static int wl1271_dev_notify(struct notifier_block *me, unsigned long what,
if (wl == wl_temp)
break;
}
if (wl == NULL)
if (wl != wl_temp)
return NOTIFY_DONE;
/* Get the interface IP address for the device. "ifa" will become
@@ -1558,8 +1559,6 @@ static int wl1271_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
default:
wl1271_error("Unsupported key cmd 0x%x", cmd);
ret = -EOPNOTSUPP;
goto out_sleep;
break;
}