summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2016-12-21 11:18:55 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-15 13:42:58 +0100
commit6fea974494af50921a5201ebb30c65dde30a1a2b (patch)
tree32ef9985554d9c9bb3df6a1f25d7318722030c0d
parent7dae85b5c355a55c3ef44ef4dad0a77125802c7f (diff)
downloadlinux-stable-6fea974494af50921a5201ebb30c65dde30a1a2b.tar.gz
linux-stable-6fea974494af50921a5201ebb30c65dde30a1a2b.tar.bz2
linux-stable-6fea974494af50921a5201ebb30c65dde30a1a2b.zip
rtlwifi: rtl_usb: Fix missing entry in USB driver's private data
commit 60f59ce0278557f7896d5158ae6d12a4855a72cc upstream. These drivers need to be able to reference "struct ieee80211_hw" from the driver's private data, and vice versa. The USB driver failed to store the address of ieee80211_hw in the private data. Although this bug has been present for a long time, it was not exposed until commit ba9f93f82aba ("rtlwifi: Fix enter/exit power_save"). Fixes: ba9f93f82aba ("rtlwifi: Fix enter/exit power_save") Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/wireless/realtek/rtlwifi/usb.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/realtek/rtlwifi/usb.c b/drivers/net/wireless/realtek/rtlwifi/usb.c
index 32aa5c1d070a..3837bbdecf05 100644
--- a/drivers/net/wireless/realtek/rtlwifi/usb.c
+++ b/drivers/net/wireless/realtek/rtlwifi/usb.c
@@ -1067,6 +1067,7 @@ int rtl_usb_probe(struct usb_interface *intf,
return -ENOMEM;
}
rtlpriv = hw->priv;
+ rtlpriv->hw = hw;
rtlpriv->usb_data = kzalloc(RTL_USB_MAX_RX_COUNT * sizeof(u32),
GFP_KERNEL);
if (!rtlpriv->usb_data)