aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>2013-08-21 04:43:07 -0400
committerDavid S. Miller <davem@davemloft.net>2013-08-21 23:47:59 -0400
commit35e57e1b49a351aa804dab6010cd46ae6112a541 (patch)
tree6167a734303228b002f01db535fb6398ac53a18f
parentef40b7ef181b7b1a24df2ef2d1ef84956bffa635 (diff)
hso: Earlier catch of error condition
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>
-rw-r--r--drivers/net/usb/hso.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index cba1d46e672e..5fb36ed23c1f 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -2886,6 +2886,11 @@ static int hso_probe(struct usb_interface *interface,
2886 struct hso_shared_int *shared_int; 2886 struct hso_shared_int *shared_int;
2887 struct hso_device *tmp_dev = NULL; 2887 struct hso_device *tmp_dev = NULL;
2888 2888
2889 if (interface->cur_altsetting->desc.bInterfaceClass != 0xFF) {
2890 dev_err(&interface->dev, "Not our interface\n");
2891 return -ENODEV;
2892 }
2893
2889 if_num = interface->altsetting->desc.bInterfaceNumber; 2894 if_num = interface->altsetting->desc.bInterfaceNumber;
2890 2895
2891 /* Get the interface/port specification from either driver_info or from 2896 /* Get the interface/port specification from either driver_info or from
@@ -2895,10 +2900,6 @@ static int hso_probe(struct usb_interface *interface,
2895 else 2900 else
2896 port_spec = hso_get_config_data(interface); 2901 port_spec = hso_get_config_data(interface);
2897 2902
2898 if (interface->cur_altsetting->desc.bInterfaceClass != 0xFF) {
2899 dev_err(&interface->dev, "Not our interface\n");
2900 return -ENODEV;
2901 }
2902 /* Check if we need to switch to alt interfaces prior to port 2903 /* Check if we need to switch to alt interfaces prior to port
2903 * configuration */ 2904 * configuration */
2904 if (interface->num_altsetting > 1) 2905 if (interface->num_altsetting > 1)