Skip to content

Commit

Permalink
Revert "rsi: fix potential null dereference in rsi_probe()"
Browse files Browse the repository at this point in the history
[ Upstream commit c5dcf8f ]

This reverts commit f170d44.

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>
  • Loading branch information
Johan Hovold authored and Greg Kroah-Hartman committed Feb 5, 2020
1 parent 09d4a9c commit 5f9b8c5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/net/wireless/rsi/rsi_91x_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 5f9b8c5

Please sign in to comment.