2013-08-21 08:43:16

by Daniel Gimpelevich

Subject: [PATCH 1/2] 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 <[email protected]>
---
drivers/net/usb/hso.c | 9 +++++----
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
+++ b/drivers/net/usb/hso.c
@@ -2886,6 +2886,11 @@ static int hso_probe(struct usb_interface *interface,
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_interface *interface,
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)
--
1.7.9.5

2013-08-21 16:25:11

by Greg Kroah-Hartman

Subject: Re: [PATCH 1/2] hso: Earlier catch of error condition

On Wed, Aug 21, 2013 at 01:43:07AM -0700, Daniel Gimpelevich wrote:
> There is no need to get an interface specification if we know it's the
> wrong one.
>
> Signed-off-by: Daniel Gimpelevich <[email protected]>

Acked-by: Greg Kroah-Hartman <[email protected]>

2013-08-22 03:48:17

by David Miller

Subject: Re: [PATCH 1/2] hso: Earlier catch of error condition

From: Greg KH <[email protected]>
Date: Wed, 21 Aug 2013 09:25:07 -0700

> On Wed, Aug 21, 2013 at 01:43:07AM -0700, Daniel Gimpelevich wrote:
>> There is no need to get an interface specification if we know it's the
>> wrong one.
>>
>> Signed-off-by: Daniel Gimpelevich <[email protected]>
>
> Acked-by: Greg Kroah-Hartman <[email protected]>

Applied.