Commit 9f21a8bd authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'staging-4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging driver fixes from Greg KH:
 "Here are three bugfixes for some staging driver issues that have been
  reported.  All have been in the linux-next tree for a while"

* tag 'staging-4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: lustre: Include unaligned.h instead of access_ok.h
  staging: vt6655: vnt_bss_info_changed check conf->beacon_rate is not NULL
  staging: comedi: das1800: add missing break in switch
parents 83c2768b fb1de5a4
...@@ -1266,6 +1266,7 @@ static const struct das1800_board *das1800_probe(struct comedi_device *dev) ...@@ -1266,6 +1266,7 @@ static const struct das1800_board *das1800_probe(struct comedi_device *dev)
if (index == das1801hc || index == das1802hc) if (index == das1801hc || index == das1802hc)
return board; return board;
index = das1801hc; index = das1801hc;
break;
default: default:
dev_err(dev->class_dev, dev_err(dev->class_dev,
"Board model: probe returned 0x%x (unknown, please report)\n", "Board model: probe returned 0x%x (unknown, please report)\n",
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#define DEBUG_SUBSYSTEM D_OTHER #define DEBUG_SUBSYSTEM D_OTHER
#include <linux/unaligned/access_ok.h> #include <asm/unaligned.h>
#include "../include/obd_support.h" #include "../include/obd_support.h"
#include "../include/lustre_debug.h" #include "../include/lustre_debug.h"
......
...@@ -1483,8 +1483,9 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, ...@@ -1483,8 +1483,9 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw,
} }
} }
if (changed & BSS_CHANGED_ASSOC && priv->op_mode != NL80211_IFTYPE_AP) { if (changed & (BSS_CHANGED_ASSOC | BSS_CHANGED_BEACON_INFO) &&
if (conf->assoc) { priv->op_mode != NL80211_IFTYPE_AP) {
if (conf->assoc && conf->beacon_rate) {
CARDbUpdateTSF(priv, conf->beacon_rate->hw_value, CARDbUpdateTSF(priv, conf->beacon_rate->hw_value,
conf->sync_tsf); conf->sync_tsf);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment