From f15f26672ee408c68c409f9ed63861738d74c9fc Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Fri, 13 Sep 2013 17:29:14 +0000 Subject: [PATCH] generic/3.10: refresh patches Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37975 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-3.10/007-hso-Earlier-catch-of-error-condition.patch | 9 ++------- .../008-hso-Fix-stack-corruption-on-some-architectures.patch | 7 +------ target/linux/generic/patches-3.10/063-arm-fix-fiq-vivt.patch | 7 +------ 3 files changed, 4 insertions(+), 19 deletions(-) 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 9b31caf06f..4eb31b31aa 100644 --- 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 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, +@@ -2886,6 +2886,11 @@ static int hso_probe(struct usb_interfac 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 -@@ -2895,10 +2900,6 @@ static int hso_probe(struct usb_interface *interface, +@@ -2895,10 +2900,6 @@ static int hso_probe(struct usb_interfac 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) --- -1.7.9.5 - diff --git a/target/linux/generic/patches-3.10/008-hso-Fix-stack-corruption-on-some-architectures.patch b/target/linux/generic/patches-3.10/008-hso-Fix-stack-corruption-on-some-architectures.patch index c6da3c1c30..067e7f85ba 100644 --- a/target/linux/generic/patches-3.10/008-hso-Fix-stack-corruption-on-some-architectures.patch +++ b/target/linux/generic/patches-3.10/008-hso-Fix-stack-corruption-on-some-architectures.patch @@ -18,8 +18,6 @@ Signed-off-by: David S. Miller drivers/net/usb/hso.c | 6 +++++- 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 +++ b/drivers/net/usb/hso.c @@ -2816,13 +2816,16 @@ exit: @@ -40,7 +38,7 @@ index 5fb36ed..86292e6 100644 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) result |= HSO_INFO_CRC_BUG; @@ -48,6 +46,3 @@ index 5fb36ed..86292e6 100644 return result; } --- -1.7.9.5 - diff --git a/target/linux/generic/patches-3.10/063-arm-fix-fiq-vivt.patch b/target/linux/generic/patches-3.10/063-arm-fix-fiq-vivt.patch index 88c3f6b63e..8c2d3da8bd 100644 --- a/target/linux/generic/patches-3.10/063-arm-fix-fiq-vivt.patch +++ b/target/linux/generic/patches-3.10/063-arm-fix-fiq-vivt.patch @@ -26,11 +26,9 @@ Signed-off-by: Russell King --- (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 +++ 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) { @@ -50,6 +48,3 @@ index 25442f4..fc79202 100644 } int claim_fiq(struct fiq_handler *f) --- -cgit v0.9.2 - -- 2.11.0