Commit 5f9b8c5a authored Oct 04, 2019 by Johan Hovold Committed by Greg Kroah-Hartman Feb 05, 2020

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>

parent 09d4a9c8

drivers/net/wireless/rsi/rsi_91x_usb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}