diff options
| author | Bjørn Mork <bjorn@mork.no> | 2012-03-16 12:56:44 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-16 13:30:10 -0700 |
| commit | 963940cf472d76eca2d36296e461202cc6997352 (patch) | |
| tree | 99d4ad0757d497e363597853cd1aa888fa35ef41 | |
| parent | 7396bd9fa1f291423b6e9a262662a447cc3deb86 (diff) | |
| download | linux-3.10-963940cf472d76eca2d36296e461202cc6997352.tar.gz linux-3.10-963940cf472d76eca2d36296e461202cc6997352.tar.bz2 linux-3.10-963940cf472d76eca2d36296e461202cc6997352.zip | |
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 <bjorn@mork.no>
Cc: <stable@vger.kernel.org> # 3.2.y, 3.3.y
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | 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 f9b11fb8e25..88447eb523c 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 && |