diff options
| author | Tejun Heo <tj@kernel.org> | 2014-04-25 18:25:55 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-04-25 18:25:55 -0400 |
| commit | 50bce01b0ee34ab9f18a2d5a7467053dda355d30 (patch) | |
| tree | 148739c6b91abdeef3ec8d26b02132e21fb98a6f /drivers/net/wireless/mwifiex/main.c | |
| parent | f8f22e53a262ebee37fc98004f16b066cf5bc125 (diff) | |
| parent | 86d56134f1b67d0c18025ba5cade95c048ed528d (diff) | |
| download | op-kernel-dev-50bce01b0ee34ab9f18a2d5a7467053dda355d30.zip op-kernel-dev-50bce01b0ee34ab9f18a2d5a7467053dda355d30.tar.gz | |
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core into for-3.16
Pull in driver-core-next to receive kernfs_notify() updates which will
be used by the planned "cgroup.populated" implementation.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/net/wireless/mwifiex/main.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c index 77db088..9c771b3 100644 --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c @@ -292,6 +292,12 @@ process_start: while ((skb = skb_dequeue(&adapter->usb_rx_data_q))) mwifiex_handle_rx_packet(adapter, skb); + /* Check for event */ + if (adapter->event_received) { + adapter->event_received = false; + mwifiex_process_event(adapter); + } + /* Check for Cmd Resp */ if (adapter->cmd_resp_received) { adapter->cmd_resp_received = false; @@ -304,12 +310,6 @@ process_start: } } - /* Check for event */ - if (adapter->event_received) { - adapter->event_received = false; - mwifiex_process_event(adapter); - } - /* Check if we need to confirm Sleep Request received previously */ if (adapter->ps_state == PS_STATE_PRE_SLEEP) { |
