diff options
| author | David S. Miller <davem@davemloft.net> | 2019-08-20 04:32:30 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-08-20 04:32:30 +0300 |
| commit | 932630fa902878f4c8c50d0b1260eeb9de16b0a4 (patch) | |
| tree | 6b67dc45af34ab0cdefe95c8fbaeb077c14bdd7f /drivers/net/wireless/intel | |
| parent | 5483ecefe9602502441b0b76968f9c4f888ad242 (diff) | |
| parent | 6004cf298a4180199dc40bc40466126df8a5a88c (diff) | |
| download | linux-932630fa902878f4c8c50d0b1260eeb9de16b0a4.tar.xz | |
Merge tag 'wireless-drivers-next-for-davem-2019-08-19' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
wireless-drivers-next patches for 5.4
First set of patches for 5.4.
Major changes:
brcmfmac
* enable 160 MHz channel support
rt2x00
* add support for PLANEX GW-USMicroN USB device
rtw88
* add Bluetooth coexistance support
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/intel')
| -rw-r--r-- | drivers/net/wireless/intel/ipw2x00/ipw2100.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/intel/iwlegacy/common.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wireless/intel/ipw2x00/ipw2100.c index 75c0c29d81f0..8dfbaff2d1fe 100644 --- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c @@ -4413,7 +4413,7 @@ static void ipw2100_kill_works(struct ipw2100_priv *priv) static int ipw2100_tx_allocate(struct ipw2100_priv *priv) { - int i, j, err = -EINVAL; + int i, j, err; void *v; dma_addr_t p; diff --git a/drivers/net/wireless/intel/iwlegacy/common.c b/drivers/net/wireless/intel/iwlegacy/common.c index 4a88e35d58d7..73f7bbf742bc 100644 --- a/drivers/net/wireless/intel/iwlegacy/common.c +++ b/drivers/net/wireless/intel/iwlegacy/common.c @@ -4942,8 +4942,7 @@ EXPORT_SYMBOL(il_add_beacon_time); static int il_pci_suspend(struct device *device) { - struct pci_dev *pdev = to_pci_dev(device); - struct il_priv *il = pci_get_drvdata(pdev); + struct il_priv *il = dev_get_drvdata(device); /* * This function is called when system goes into suspend state |