generic/3.10: refresh patches
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 37975
This commit is contained in:
parent
2d49e32715
commit
3a241f67a7
3 changed files with 4 additions and 19 deletions
|
@ -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,
|
@@ -2886,6 +2886,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,
|
@@ -2895,10 +2900,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
|
|
||||||
|
|
||||||
|
|
|
@ -18,8 +18,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
drivers/net/usb/hso.c | 6 +++++-
|
drivers/net/usb/hso.c | 6 +++++-
|
||||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
|
|
||||||
index 5fb36ed..86292e6 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
|
||||||
@@ -2816,13 +2816,16 @@ exit:
|
@@ -2816,13 +2816,16 @@ exit:
|
||||||
|
@ -40,7 +38,7 @@ index 5fb36ed..86292e6 100644
|
||||||
return -EIO;
|
return -EIO;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2873,6 +2876,7 @@ static int hso_get_config_data(struct usb_interface *interface)
|
@@ -2873,6 +2876,7 @@ static int hso_get_config_data(struct us
|
||||||
if (config_data[16] & 0x1)
|
if (config_data[16] & 0x1)
|
||||||
result |= HSO_INFO_CRC_BUG;
|
result |= HSO_INFO_CRC_BUG;
|
||||||
|
|
||||||
|
@ -48,6 +46,3 @@ index 5fb36ed..86292e6 100644
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
--
|
|
||||||
1.7.9.5
|
|
||||||
|
|
||||||
|
|
|
@ -26,11 +26,9 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
||||||
---
|
---
|
||||||
(limited to 'arch/arm/kernel/fiq.c')
|
(limited to 'arch/arm/kernel/fiq.c')
|
||||||
|
|
||||||
diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
|
|
||||||
index 25442f4..fc79202 100644
|
|
||||||
--- a/arch/arm/kernel/fiq.c
|
--- a/arch/arm/kernel/fiq.c
|
||||||
+++ b/arch/arm/kernel/fiq.c
|
+++ b/arch/arm/kernel/fiq.c
|
||||||
@@ -84,17 +84,13 @@ int show_fiq_list(struct seq_file *p, int prec)
|
@@ -84,17 +84,13 @@ int show_fiq_list(struct seq_file *p, in
|
||||||
|
|
||||||
void set_fiq_handler(void *start, unsigned int length)
|
void set_fiq_handler(void *start, unsigned int length)
|
||||||
{
|
{
|
||||||
|
@ -50,6 +48,3 @@ index 25442f4..fc79202 100644
|
||||||
}
|
}
|
||||||
|
|
||||||
int claim_fiq(struct fiq_handler *f)
|
int claim_fiq(struct fiq_handler *f)
|
||||||
--
|
|
||||||
cgit v0.9.2
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue