| From 963940cf472d76eca2d36296e461202cc6997352 Mon Sep 17 00:00:00 2001 |
| From: Bjørn Mork <bjorn@mork.no> |
| Date: Fri, 16 Mar 2012 12:56:44 +0100 |
| Subject: USB: option: make interface blacklist work again |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Bjørn Mork <bjorn@mork.no> |
| |
| 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 <bjorn@mork.no> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/serial/option.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/drivers/usb/serial/option.c |
| +++ b/drivers/usb/serial/option.c |
| @@ -1373,6 +1373,7 @@ static int option_probe(struct usb_seria |
| 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 && |
