diff options
| author | Johan Hovold <johan@kernel.org> | 2019-10-04 16:44:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-02-05 21:22:53 +0000 |
| commit | 5f9b8c5a46188eae6a409201e4cc5703e5639e48 (patch) | |
| tree | 5debee18dbf07f207673bda63761d1b21b6e3543 | |
| parent | 09d4a9c83c6821a74171aabcc785ddcec3c30697 (diff) | |
Revert "rsi: fix potential null dereference in rsi_probe()"
[ Upstream commit c5dcf8f0e850a504235a0af51f73d51b6ddc0933 ]
This reverts commit f170d44bc4ec2feae5f6206980e7ae7fbf0432a0.
USB core will never call a USB-driver probe function with a NULL
device-id pointer.
Reverting before removing the existing checks in order to document this
and prevent the offending commit from being "autoselected" for stable.
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/net/wireless/rsi/rsi_91x_usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c index d6cdabef264d..4b9e406b8461 100644 --- a/drivers/net/wireless/rsi/rsi_91x_usb.c +++ b/drivers/net/wireless/rsi/rsi_91x_usb.c @@ -805,7 +805,7 @@ static int rsi_probe(struct usb_interface *pfunction, adapter->device_model = RSI_DEV_9116; } else { rsi_dbg(ERR_ZONE, "%s: Unsupported RSI device id 0x%x\n", - __func__, id ? id->idProduct : 0x0); + __func__, id->idProduct); goto err1; } |