summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/intersil/prism54/islpci_dev.c
diff options
context:
space:
mode:
authorDavid S. Miller2018-12-04 00:44:27 +0100
committerDavid S. Miller2018-12-04 00:44:27 +0100
commitce01a56ba3d9a56e9c7dd4662e2753b102a17d62 (patch)
treef93abeb50254c299dd07d2f3d72da9d91797b2d2 /drivers/net/wireless/intersil/prism54/islpci_dev.c
parentMerge branch 'davinci_emac-read-the-MAC-address-from-nvmem' (diff)
parentbrcmfmac: Fix out of bounds memory access during fw load (diff)
downloadkernel-qcow2-linux-ce01a56ba3d9a56e9c7dd4662e2753b102a17d62.tar.gz
kernel-qcow2-linux-ce01a56ba3d9a56e9c7dd4662e2753b102a17d62.tar.xz
kernel-qcow2-linux-ce01a56ba3d9a56e9c7dd4662e2753b102a17d62.zip
Merge tag 'wireless-drivers-next-for-davem-2018-11-30' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says: ==================== wireless-drivers-next patches for 4.21 First set of patches for 4.21. Most notable here is support for Quantenna's QSR1000/QSR2000 chipsets and more flexible ways to provide nvram files for brcmfmac. Major changes: brcmfmac * add support for first trying to get a board specific nvram file * add support for getting nvram contents from EFI variables qtnfmac * use single PCIe driver for all platforms and rename Kconfig option CONFIG_QTNFMAC_PEARL_PCIE to CONFIG_QTNFMAC_PCIE * add support for QSR1000/QSR2000 (Topaz) family of chipsets ath10k * add support for WCN3990 firmware crash recovery * add firmware memory dump support for QCA4019 wil6210 * add firmware error recovery while in AP mode ath9k * remove experimental notice from dynack feature iwlwifi * PCI IDs for some new 9000-series cards * improve antenna usage on connection problems * new firmware debugging infrastructure * some more work on 802.11ax * improve support for multiple RF modules with 22000 devices cordic * move cordic macros and defines to a public header file * convert brcmsmac and b43 to fully use cordic library ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/intersil/prism54/islpci_dev.c')
-rw-r--r--drivers/net/wireless/intersil/prism54/islpci_dev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/intersil/prism54/islpci_dev.c b/drivers/net/wireless/intersil/prism54/islpci_dev.c
index 325176d4d796..ad6d3a56ae06 100644
--- a/drivers/net/wireless/intersil/prism54/islpci_dev.c
+++ b/drivers/net/wireless/intersil/prism54/islpci_dev.c
@@ -932,6 +932,7 @@ islpci_set_state(islpci_private *priv, islpci_state_t new_state)
switch (new_state) {
case PRV_STATE_OFF:
priv->state_off++;
+ /* fall through */
default:
priv->state = new_state;
break;