tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 9f21a8bd 83c2768b

+5 -3
+1
drivers/staging/comedi/drivers/das1800.c
··· 1266 1266 if (index == das1801hc || index == das1802hc) 1267 1267 return board; 1268 1268 index = das1801hc; 1269 + break; 1269 1270 default: 1270 1271 dev_err(dev->class_dev, 1271 1272 "Board model: probe returned 0x%x (unknown, please report)\n",
+1 -1
drivers/staging/lustre/lustre/obdclass/debug.c
··· 40 40 41 41 #define DEBUG_SUBSYSTEM D_OTHER 42 42 43 - #include <linux/unaligned/access_ok.h> 43 + #include <asm/unaligned.h> 44 44 45 45 #include "../include/obd_support.h" 46 46 #include "../include/lustre_debug.h"
+3 -2
drivers/staging/vt6655/device_main.c
··· 1483 1483 } 1484 1484 } 1485 1485 1486 - if (changed & BSS_CHANGED_ASSOC && priv->op_mode != NL80211_IFTYPE_AP) { 1487 - if (conf->assoc) { 1486 + if (changed & (BSS_CHANGED_ASSOC | BSS_CHANGED_BEACON_INFO) && 1487 + priv->op_mode != NL80211_IFTYPE_AP) { 1488 + if (conf->assoc && conf->beacon_rate) { 1488 1489 CARDbUpdateTSF(priv, conf->beacon_rate->hw_value, 1489 1490 conf->sync_tsf); 1490 1491