kernel: update 3.18 to 3.18.16

[openwrt/svn-archive/archive.git] / target / linux / bcm53xx / patches-3.18 / 183-USB-bcma-fix-error-handling-in-bcma_hcd_create_pdev.patch

diff --git a/target/linux/bcm53xx/patches-3.18/183-USB-bcma-fix-error-handling-in-bcma_hcd_create_pdev.patch b/target/linux/bcm53xx/patches-3.18/183-USB-bcma-fix-error-handling-in-bcma_hcd_create_pdev.patch
index 799c93ef413a9c3c7b399d3acf588af203c60909..91cd0fa320ccbc3e1ad999a244d26c5fa061a333 100644 (file)
--- a/target/linux/bcm53xx/patches-3.18/183-USB-bcma-fix-error-handling-in-bcma_hcd_create_pdev.patch
+++ b/target/linux/bcm53xx/patches-3.18/183-USB-bcma-fix-error-handling-in-bcma_hcd_create_pdev.patch
@@ -11,11 +11,9 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  drivers/usb/host/bcma-hcd.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c
-index d7ea50d..8a38313 100644
 --- a/drivers/usb/host/bcma-hcd.c
 +++ b/drivers/usb/host/bcma-hcd.c
-@@ -169,7 +169,7 @@ static struct platform_device *bcma_hcd_create_pdev(struct bcma_device *dev, boo
+@@ -169,7 +169,7 @@ static struct platform_device *bcma_hcd_
  {
        struct platform_device *hci_dev;
        struct resource hci_res[2];
@@ -24,7 +22,7 @@ index d7ea50d..8a38313 100644
  
        memset(hci_res, 0, sizeof(hci_res));
  
-@@ -183,7 +183,7 @@ static struct platform_device *bcma_hcd_create_pdev(struct bcma_device *dev, boo
+@@ -183,7 +183,7 @@ static struct platform_device *bcma_hcd_
        hci_dev = platform_device_alloc(ohci ? "ohci-platform" :
                                        "ehci-platform" , 0);
        if (!hci_dev)
@@ -33,6 +31,3 @@ index d7ea50d..8a38313 100644
  
        hci_dev->dev.parent = &dev->dev;
        hci_dev->dev.dma_mask = &hci_dev->dev.coherent_dma_mask;
--- 
-1.8.4.5
-