projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: add generic GPIO watchdog driver
[openwrt.git]
/
target
/
linux
/
generic
/
patches-3.10
/
007-hso-Earlier-catch-of-error-condition.patch
diff --git
a/target/linux/generic/patches-3.10/007-hso-Earlier-catch-of-error-condition.patch
b/target/linux/generic/patches-3.10/007-hso-Earlier-catch-of-error-condition.patch
index 9b31caf06fe022dc82fe642eca85896efcd0052e..4eb31b31aacea92166a1d812ef857df48b510858 100644
(file)
--- a/
target/linux/generic/patches-3.10/007-hso-Earlier-catch-of-error-condition.patch
+++ b/
target/linux/generic/patches-3.10/007-hso-Earlier-catch-of-error-condition.patch
@@
-13,11
+13,9
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/hso.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
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
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
-@@ -2886,6 +2886,11 @@ static int hso_probe(struct usb_interfac
e *interface,
+@@ -2886,6 +2886,11 @@ static int hso_probe(struct usb_interfac
struct hso_shared_int *shared_int;
struct hso_device *tmp_dev = NULL;
struct hso_shared_int *shared_int;
struct hso_device *tmp_dev = NULL;
@@
-29,7
+27,7
@@
index cba1d46..5fb36ed 100644
if_num = interface->altsetting->desc.bInterfaceNumber;
/* Get the interface/port specification from either driver_info or from
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
e *interface,
+@@ -2895,10 +2900,6 @@ static int hso_probe(struct usb_interfac
else
port_spec = hso_get_config_data(interface);
else
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
* configuration */
if (interface->num_altsetting > 1)
/* Check if we need to switch to alt interfaces prior to port
* configuration */
if (interface->num_altsetting > 1)
---
-1.7.9.5
-