summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-3.6
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-10-02 22:26:43 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-10-02 22:26:43 +0000
commit101034fa2335e407843b6eeee1ac458ffa9e605b (patch)
tree9e08916217dd2314931fdbe4417c737b390cf7d9 /target/linux/generic/patches-3.6
parentfa839274b0f1de41be498c25bbc4d1a92b48d64e (diff)
downloadmtk-20170518-101034fa2335e407843b6eeee1ac458ffa9e605b.zip
mtk-20170518-101034fa2335e407843b6eeee1ac458ffa9e605b.tar.gz
mtk-20170518-101034fa2335e407843b6eeee1ac458ffa9e605b.tar.bz2
kernel: refresh patches
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 38291
Diffstat (limited to 'target/linux/generic/patches-3.6')
-rw-r--r--target/linux/generic/patches-3.6/007-hso-Earlier-catch-of-error-condition.patch9
-rw-r--r--target/linux/generic/patches-3.6/008-hso-Fix-stack-corruption-on-some-architectures.patch9
-rw-r--r--target/linux/generic/patches-3.6/441-block2mtd_refresh.patch6
3 files changed, 7 insertions, 17 deletions
diff --git a/target/linux/generic/patches-3.6/007-hso-Earlier-catch-of-error-condition.patch b/target/linux/generic/patches-3.6/007-hso-Earlier-catch-of-error-condition.patch
index 9b31caf..a8a6225 100644
--- a/target/linux/generic/patches-3.6/007-hso-Earlier-catch-of-error-condition.patch
+++ b/target/linux/generic/patches-3.6/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(-)
-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,
+@@ -2908,6 +2908,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,
+@@ -2917,10 +2922,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.6/008-hso-Fix-stack-corruption-on-some-architectures.patch b/target/linux/generic/patches-3.6/008-hso-Fix-stack-corruption-on-some-architectures.patch
index c6da3c1..c562c1b 100644
--- a/target/linux/generic/patches-3.6/008-hso-Fix-stack-corruption-on-some-architectures.patch
+++ b/target/linux/generic/patches-3.6/008-hso-Fix-stack-corruption-on-some-architectures.patch
@@ -18,11 +18,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
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:
+@@ -2838,13 +2838,16 @@ exit:
static int hso_get_config_data(struct usb_interface *interface)
{
struct usb_device *usbdev = interface_to_usbdev(interface);
@@ -40,7 +38,7 @@ index 5fb36ed..86292e6 100644
return -EIO;
}
-@@ -2873,6 +2876,7 @@ static int hso_get_config_data(struct usb_interface *interface)
+@@ -2895,6 +2898,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.6/441-block2mtd_refresh.patch b/target/linux/generic/patches-3.6/441-block2mtd_refresh.patch
index 7f8a1f1..9aeb3f4 100644
--- a/target/linux/generic/patches-3.6/441-block2mtd_refresh.patch
+++ b/target/linux/generic/patches-3.6/441-block2mtd_refresh.patch
@@ -231,8 +231,7 @@
- bdev = blkdev_get_by_path(devname, mode, dev);
-#ifndef MODULE
- if (IS_ERR(bdev)) {
-+ strcpy(dev->devname, devname);
-
+-
- /* We might not have rootfs mounted at this point. Try
- to resolve the device name by other means. */
-
@@ -247,7 +246,8 @@
- goto devinit_err;
- }
- dev->blkdev = bdev;
--
++ strcpy(dev->devname, devname);
+
- if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) {
- ERROR("attempting to use an MTD device as a block device");
+ if (_open_bdev(dev))