|
|
@ -13,11 +13,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net> |
|
|
|
drivers/net/usb/hso.c | 9 +++++----
|
|
|
|
drivers/net/usb/hso.c | 9 +++++----
|
|
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
|
|
|
|
|
|
|
|
index cba1d46..5fb36ed 100644
|
|
|
|
|
|
|
|
--- a/drivers/net/usb/hso.c
|
|
|
|
--- a/drivers/net/usb/hso.c
|
|
|
|
+++ b/drivers/net/usb/hso.c
|
|
|
|
+++ b/drivers/net/usb/hso.c
|
|
|
|
@@ -2886,6 +2886,11 @@ static int hso_probe(struct usb_interface *interface,
|
|
|
|
@@ -2927,6 +2927,11 @@ static int hso_probe(struct usb_interfac
|
|
|
|
struct hso_shared_int *shared_int;
|
|
|
|
struct hso_shared_int *shared_int;
|
|
|
|
struct hso_device *tmp_dev = NULL;
|
|
|
|
struct hso_device *tmp_dev = NULL;
|
|
|
|
|
|
|
|
|
|
|
@ -29,7 +27,7 @@ index cba1d46..5fb36ed 100644 |
|
|
|
if_num = interface->altsetting->desc.bInterfaceNumber;
|
|
|
|
if_num = interface->altsetting->desc.bInterfaceNumber;
|
|
|
|
|
|
|
|
|
|
|
|
/* Get the interface/port specification from either driver_info or from
|
|
|
|
/* Get the interface/port specification from either driver_info or from
|
|
|
|
@@ -2895,10 +2900,6 @@ static int hso_probe(struct usb_interface *interface,
|
|
|
|
@@ -2936,10 +2941,6 @@ static int hso_probe(struct usb_interfac
|
|
|
|
else
|
|
|
|
else
|
|
|
|
port_spec = hso_get_config_data(interface);
|
|
|
|
port_spec = hso_get_config_data(interface);
|
|
|
|
|
|
|
|
|
|
|
@ -40,6 +38,3 @@ index cba1d46..5fb36ed 100644 |
|
|
|
/* Check if we need to switch to alt interfaces prior to port
|
|
|
|
/* Check if we need to switch to alt interfaces prior to port
|
|
|
|
* configuration */
|
|
|
|
* configuration */
|
|
|
|
if (interface->num_altsetting > 1)
|
|
|
|
if (interface->num_altsetting > 1)
|
|
|
|
--
|
|
|
|
|
|
|
|
1.7.9.5
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|