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/183-USB-bcma-fix-error-handling-in-bcma_hcd_create_pdev.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/183-USB-bcma-fix-error-handling-in-bcma_hcd_create_pdev.patch')
-rw-r--r-- | target/linux/bcm53xx/patches-3.18/183-USB-bcma-fix-error-handling-in-bcma_hcd_create_pdev.patch | 9 |
1 files changed, 2 insertions, 7 deletions
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 799c93ef41..91cd0fa320 100644 --- 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 - |