kernel: update 3.18 to 3.18.16

[15.05/openwrt.git] / target / linux / bcm53xx / patches-3.18 / 182-USB-bcma-use-devm_kzalloc.patch

diff --git a/target/linux/bcm53xx/patches-3.18/182-USB-bcma-use-devm_kzalloc.patch b/target/linux/bcm53xx/patches-3.18/182-USB-bcma-use-devm_kzalloc.patch
index 32a1765..700d354 100644 (file)
--- a/target/linux/bcm53xx/patches-3.18/182-USB-bcma-use-devm_kzalloc.patch
+++ b/target/linux/bcm53xx/patches-3.18/182-USB-bcma-use-devm_kzalloc.patch
@@ -11,11 +11,9 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  drivers/usb/host/bcma-hcd.c | 11 ++++-------
  1 file changed, 4 insertions(+), 7 deletions(-)
 
-diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c
-index 853bf9d..d7ea50d 100644
 --- a/drivers/usb/host/bcma-hcd.c
 +++ b/drivers/usb/host/bcma-hcd.c
-@@ -225,7 +225,8 @@ static int bcma_hcd_probe(struct bcma_device *dev)
+@@ -225,7 +225,8 @@ static int bcma_hcd_probe(struct bcma_de
        if (dma_set_mask_and_coherent(dev->dma_dev, DMA_BIT_MASK(32)))
                return -EOPNOTSUPP;
  
@@ -25,7 +23,7 @@ index 853bf9d..d7ea50d 100644
        if (!usb_dev)
                return -ENOMEM;
  
-@@ -239,10 +240,8 @@ static int bcma_hcd_probe(struct bcma_device *dev)
+@@ -239,10 +240,8 @@ static int bcma_hcd_probe(struct bcma_de
                ohci_addr = 0x18009000;
  
        usb_dev->ohci_dev = bcma_hcd_create_pdev(dev, true, ohci_addr);
@@ -38,7 +36,7 @@ index 853bf9d..d7ea50d 100644
  
        usb_dev->ehci_dev = bcma_hcd_create_pdev(dev, false, dev->addr);
        if (IS_ERR(usb_dev->ehci_dev)) {
-@@ -255,8 +254,6 @@ static int bcma_hcd_probe(struct bcma_device *dev)
+@@ -255,8 +254,6 @@ static int bcma_hcd_probe(struct bcma_de
  
  err_unregister_ohci_dev:
        platform_device_unregister(usb_dev->ohci_dev);
@@ -47,6 +45,3 @@ index 853bf9d..d7ea50d 100644
        return err;
  }
  
--- 
-1.8.4.5
-