diff options
| author | Bjørn Mork <bjorn@mork.no> | 2012-03-16 12:56:44 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-02 09:26:51 -0700 |
| commit | 3211a2ff343e6ad01a308036f154528d3bbd19e4 (patch) | |
| tree | d52ae88ac62d45f151708a1307eb2842b5ebae49 /drivers/usb/serial/option.c | |
| parent | ab39729d7263d1c185a0b98cd0a3fc41259568b7 (diff) | |
| download | kernel_samsung_smdk4412-3211a2ff343e6ad01a308036f154528d3bbd19e4.zip kernel_samsung_smdk4412-3211a2ff343e6ad01a308036f154528d3bbd19e4.tar.gz kernel_samsung_smdk4412-3211a2ff343e6ad01a308036f154528d3bbd19e4.tar.bz2 | |
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 <bjorn@mork.no>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/option.c')
| -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 3c4b7df..6410935 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 && |