X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fpatches-3.10%2F003-11-004-hso-Earlier-catch-of-error-condition.patch;fp=target%2Flinux%2Fgeneric%2Fpatches-3.10%2F003-11-004-hso-Earlier-catch-of-error-condition.patch;h=0000000000000000000000000000000000000000;hb=e1e202f842008f02b9fe9ef12562353a32d1d305;hp=04866edbcd14a4fa5ec50e85f10c246a3daafeed;hpb=4394155641861a34f87ccc671b5915f44c828949;p=openwrt.git

diff --git a/target/linux/generic/patches-3.10/003-11-004-hso-Earlier-catch-of-error-condition.patch b/target/linux/generic/patches-3.10/003-11-004-hso-Earlier-catch-of-error-condition.patch
deleted file mode 100644
index 04866edbcd..0000000000
--- a/target/linux/generic/patches-3.10/003-11-004-hso-Earlier-catch-of-error-condition.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 35e57e1b49a351aa804dab6010cd46ae6112a541 Mon Sep 17 00:00:00 2001
-From: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
-Date: Wed, 21 Aug 2013 01:43:07 -0700
-Subject: [PATCH] hso: Earlier catch of error condition
-
-commit 35e57e1b49a351aa804dab6010cd46ae6112a541 upstream.
-
-There is no need to get an interface specification if we know it's the
-wrong one.
-
-Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
-Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/usb/hso.c |    9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
---- a/drivers/net/usb/hso.c
-+++ b/drivers/net/usb/hso.c
-@@ -2886,6 +2886,11 @@ static int hso_probe(struct usb_interfac
- 	struct hso_shared_int *shared_int;
- 	struct hso_device *tmp_dev = NULL;
- 
-+	if (interface->cur_altsetting->desc.bInterfaceClass != 0xFF) {
-+		dev_err(&interface->dev, "Not our interface\n");
-+		return -ENODEV;
-+	}
-+
- 	if_num = interface->altsetting->desc.bInterfaceNumber;
- 
- 	/* Get the interface/port specification from either driver_info or from
-@@ -2895,10 +2900,6 @@ static int hso_probe(struct usb_interfac
- 	else
- 		port_spec = hso_get_config_data(interface);
- 
--	if (interface->cur_altsetting->desc.bInterfaceClass != 0xFF) {
--		dev_err(&interface->dev, "Not our interface\n");
--		return -ENODEV;
--	}
- 	/* Check if we need to switch to alt interfaces prior to port
- 	 * configuration */
- 	if (interface->num_altsetting > 1)