Commit 12fe29ee authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'staging-6.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging driver fix from Greg KH:
 "Here is a single staging driver fix for 6.1-rc6.

  It resolves a bogus signed character test as pointed out, and fixed
  by, Jason in the rtl8192e driver

  It has been in linux-next for a few weeks now with no reported
  problems"

* tag 'staging-6.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: rtl8192e: remove bogus ssid character sign test
parents 09389357 937ec9f7
...@@ -439,7 +439,7 @@ int rtllib_wx_set_essid(struct rtllib_device *ieee, ...@@ -439,7 +439,7 @@ int rtllib_wx_set_essid(struct rtllib_device *ieee,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
int ret = 0, len, i; int ret = 0, len;
short proto_started; short proto_started;
unsigned long flags; unsigned long flags;
...@@ -455,13 +455,6 @@ int rtllib_wx_set_essid(struct rtllib_device *ieee, ...@@ -455,13 +455,6 @@ int rtllib_wx_set_essid(struct rtllib_device *ieee,
goto out; goto out;
} }
for (i = 0; i < len; i++) {
if (extra[i] < 0) {
ret = -1;
goto out;
}
}
if (proto_started) if (proto_started)
rtllib_stop_protocol(ieee, true); rtllib_stop_protocol(ieee, true);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment