diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-06-17 10:22:04 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-06-17 10:22:04 +0000 |
| commit | b9c13dc540403877ee43369ce0027f43c7cab928 (patch) | |
| tree | dec25a80e17d7c6d67b6daf822c22f5d10db3dd5 /target/linux/bcm53xx/patches-3.18/182-USB-bcma-use-devm_kzalloc.patch | |
| parent | 966f1ab30128279f7b07acda088f4f3399718867 (diff) | |
| download | upstream-b9c13dc540403877ee43369ce0027f43c7cab928.tar.gz upstream-b9c13dc540403877ee43369ce0027f43c7cab928.tar.bz2 upstream-b9c13dc540403877ee43369ce0027f43c7cab928.zip | |
kernel: update 3.18 to 3.18.16
Changelogs:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.15
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.16
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Backport of r46011.
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46015 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/bcm53xx/patches-3.18/182-USB-bcma-use-devm_kzalloc.patch')
| -rw-r--r-- | target/linux/bcm53xx/patches-3.18/182-USB-bcma-use-devm_kzalloc.patch | 11 |
1 files changed, 3 insertions, 8 deletions
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 32a17653de..700d354332 100644 --- 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 - |