From: Bjørn Mork Date: Fri, 16 Mar 2012 11:56:44 +0000 (+0100) Subject: USB: option: make interface blacklist work again X-Git-Tag: v3.3.1~173 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5137c924b6e442749e3f1871c5c6bb31f70a48b5;p=thirdparty%2Fkernel%2Fstable.git USB: option: make interface blacklist work again commit 963940cf472d76eca2d36296e461202cc6997352 upstream. 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 26a314cc41ed9..5d37e9589bb23 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -1373,6 +1373,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 &&