Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/usb/serial/option.c

+1 −0
Original line number Diff line number Diff line
@@ -1346,6 +1346,7 @@ static int option_probe(struct usb_serial *serial, 
		serial->interface->cur_altsetting->desc.bInterfaceNumber,

		OPTION_BLACKLIST_RESERVED_IF,

		(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 */

	if (serial->dev->descriptor.idVendor == SAMSUNG_VENDOR_ID &&