kernel: check return code of nla_parse in pcomp_lzma on 2.6.31

[openwrt.git] / target / linux / brcm47xx / patches-2.6.28 / 270-ehci-ssb.patch

diff --git a/target/linux/brcm47xx/patches-2.6.28/270-ehci-ssb.patch b/target/linux/brcm47xx/patches-2.6.28/270-ehci-ssb.patch
index 767ba23..3b5cfd5 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.28/270-ehci-ssb.patch
+++ b/target/linux/brcm47xx/patches-2.6.28/270-ehci-ssb.patch
@@ -1,6 +1,12 @@
-diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
---- a/drivers/usb/host/Kconfig
-+++ b/drivers/usb/host/Kconfig
+---
+ drivers/usb/host/Kconfig    |   13 ++
+ drivers/usb/host/ehci-hcd.c |   12 ++
+ drivers/usb/host/ehci-ssb.c |  201 ++++++++++++++++++++++++++++++++++++++++++++
+ drivers/usb/host/ohci-ssb.c |   23 +++++
+ 4 files changed, 247 insertions(+), 2 deletions(-)
+
+--- linux-2.6.28.10.orig/drivers/usb/host/Kconfig
++++ linux-2.6.28.10/drivers/usb/host/Kconfig
 @@ -96,6 +96,19 @@ config USB_EHCI_HCD_PPC_OF
          Enables support for the USB controller present on the PowerPC
          OpenFirmware platform bus.
@@ -21,10 +27,9 @@ diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
  config USB_ISP116X_HCD
        tristate "ISP116X HCD support"
        depends on USB
-diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
---- a/drivers/usb/host/ehci-hcd.c
-+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1034,8 +1034,16 @@ MODULE_LICENSE ("GPL");
+--- linux-2.6.28.10.orig/drivers/usb/host/ehci-hcd.c
++++ linux-2.6.28.10/drivers/usb/host/ehci-hcd.c
+@@ -1036,8 +1036,16 @@ MODULE_LICENSE ("GPL");
  #define       PLATFORM_DRIVER         ixp4xx_ehci_driver
  #endif
  
@@ -43,9 +48,8 @@ diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
  #error "missing bus glue for ehci-hcd"
  #endif
  
-diff --git a/drivers/usb/host/ehci-ssb.c b/drivers/usb/host/ehci-ssb.c
 --- /dev/null
-+++ b/drivers/usb/host/ehci-ssb.c
++++ linux-2.6.28.10/drivers/usb/host/ehci-ssb.c
 @@ -0,0 +1,201 @@
 +/*
 + * Sonics Silicon Backplane
@@ -248,9 +252,8 @@ diff --git a/drivers/usb/host/ehci-ssb.c b/drivers/usb/host/ehci-ssb.c
 +      SSB_DEVTABLE_END
 +};
 +MODULE_DEVICE_TABLE(ssb, ssb_ehci_table);
-diff --git a/drivers/usb/host/ohci-ssb.c b/drivers/usb/host/ohci-ssb.c
---- a/drivers/usb/host/ohci-ssb.c
-+++ b/drivers/usb/host/ohci-ssb.c
+--- linux-2.6.28.10.orig/drivers/usb/host/ohci-ssb.c
++++ linux-2.6.28.10/drivers/usb/host/ohci-ssb.c
 @@ -17,6 +17,8 @@
   */
  #include <linux/ssb/ssb.h>
@@ -268,7 +271,7 @@ diff --git a/drivers/usb/host/ohci-ssb.c b/drivers/usb/host/ohci-ssb.c
  };
  
  static inline
-@@ -92,13 +95,25 @@ static const struct hc_driver ssb_ohci_hc_driver = {
+@@ -92,13 +95,25 @@ static const struct hc_driver ssb_ohci_h
  static void ssb_ohci_detach(struct ssb_device *dev)
  {
        struct usb_hcd *hcd = ssb_get_drvdata(dev);
@@ -294,7 +297,7 @@ diff --git a/drivers/usb/host/ohci-ssb.c b/drivers/usb/host/ohci-ssb.c
  static int ssb_ohci_attach(struct ssb_device *dev)
  {
        struct ssb_ohci_device *ohcidev;
-@@ -184,6 +199,14 @@ static int ssb_ohci_attach(struct ssb_device *dev)
+@@ -165,6 +180,14 @@ static int ssb_ohci_attach(struct ssb_de
  
        ssb_set_drvdata(dev, hcd);