commit 0d905fd "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: Bjørn Mork <bjorn@xxxxxxx> Cc: <stable@xxxxxxxxxxxxxxx> # 3.2.y, 3.3.y --- Hello, I just noticed this while struggling with getting something else to work. Seems that the option blacklist has been effectively disabled since 3.2. Guess it's too late for 3.3 even for an obious oneliner like this, so I marked it for 3.3 stable as well as 3.2. Thanks, Bjørn drivers/usb/serial/option.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index b54afce..5ccd861 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -1360,6 +1360,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 && -- 1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
