Commit 963940cf authored by Bjørn Mork's avatar Bjørn Mork Committed by Greg Kroah-Hartman

USB: option: make interface blacklist work again

commit 0d905fd5 "USB: option: convert Huawei K3765, K4505, K4605
reservered interface to blacklist" accidentally ANDed two
blacklist tests by leaving out a return.  This was not noticed
because the two consecutive bracketless if statements made it
syntactically correct.
Signed-off-by: default avatarBjørn Mork <bjorn@mork.no>
Cc: <stable@vger.kernel.org> # 3.2.y, 3.3.y
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7396bd9f
...@@ -1346,6 +1346,7 @@ static int option_probe(struct usb_serial *serial, ...@@ -1346,6 +1346,7 @@ static int option_probe(struct usb_serial *serial,
serial->interface->cur_altsetting->desc.bInterfaceNumber, serial->interface->cur_altsetting->desc.bInterfaceNumber,
OPTION_BLACKLIST_RESERVED_IF, OPTION_BLACKLIST_RESERVED_IF,
(const struct option_blacklist_info *) id->driver_info)) (const struct option_blacklist_info *) id->driver_info))
return -ENODEV;
/* Don't bind network interface on Samsung GT-B3730, it is handled by a separate module */ /* Don't bind network interface on Samsung GT-B3730, it is handled by a separate module */
if (serial->dev->descriptor.idVendor == SAMSUNG_VENDOR_ID && if (serial->dev->descriptor.idVendor == SAMSUNG_VENDOR_ID &&
......
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