diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2013-02-06 12:54:17 -0600 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-02-08 14:51:34 -0500 |
| commit | 957f4aca5fa0db69635271bc4621cc0b65b2d590 (patch) | |
| tree | afccf897b7a9d6e91c028f66a851ce0631ca64f2 /drivers/net/wireless/rtlwifi/usb.h | |
| parent | cbb1ec9491fdbd3aa9dee6ad9a3bcb05bdfd279d (diff) | |
rtlwifi: rtl8192cu: Fix NULL dereference BUG when using new_id
When the new_id entry in /sysfs is used for a foreign USB device, rtlwifi
BUGS with a NULL pointer dereference because the per-driver configuration
data is not available. The probe function has been restructured as
suggested by Ben Hutchings <bhutchings@solarflare.com>.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/usb.h')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/usb.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/usb.h b/drivers/net/wireless/rtlwifi/usb.h index 5235136f6dd..fb986f98d1d 100644 --- a/drivers/net/wireless/rtlwifi/usb.h +++ b/drivers/net/wireless/rtlwifi/usb.h @@ -157,7 +157,8 @@ struct rtl_usb_priv { int rtl_usb_probe(struct usb_interface *intf, - const struct usb_device_id *id); + const struct usb_device_id *id, + struct rtl_hal_cfg *rtl92cu_hal_cfg); void rtl_usb_disconnect(struct usb_interface *intf); int rtl_usb_suspend(struct usb_interface *pusb_intf, pm_message_t message); int rtl_usb_resume(struct usb_interface *pusb_intf); |