rtlwifi: rtl_usb: Fix missing entry in USB driver's private data

lwfinger · Kalle Valo · commit 60f59ce02785 · 2016-12-30T15:38:13.000+02:00
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 ba9f93f ("rtlwifi: Fix enter/exit power_save"). Fixes: ba9f93f ("rtlwifi: Fix enter/exit power_save") Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
diff --git a/drivers/net/wireless/realtek/rtlwifi/usb.c b/drivers/net/wireless/realtek/rtlwifi/usb.c
@@ -1063,6 +1063,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)

Original file line number	Diff line number	Diff line change
`@@ -1063,6 +1063,7 @@ int rtl_usb_probe(struct usb_interface *intf,`
`1063`	`1063`	`return -ENOMEM;`
`1064`	`1064`	`}`
`1065`	`1065`	`rtlpriv = hw->priv;`
	`1066`	`+ rtlpriv->hw = hw;`
`1066`	`1067`	`rtlpriv->usb_data = kzalloc(RTL_USB_MAX_RX_COUNT * sizeof(u32),`
`1067`	`1068`	`GFP_KERNEL);`
`1068`	`1069`	`if (!rtlpriv->usb_data)`