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: MMI-PSA29.97-13-9~17266^2~3 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=963940cf472d76eca2d36296e461202cc6997352;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git USB: option: make interface blacklist work again 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 Cc: # 3.2.y, 3.3.y Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index f9b11fb8e25c..88447eb523c0 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -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 &&