diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2016-05-08 21:09:12 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2016-06-19 19:56:13 +0200 |
| commit | fb582172ad8291c7cd4d015f1606b1f31fd4485a (patch) | |
| tree | 4ad0e254287748771ed50122b6b0a25fddd6ee74 /target/linux/bcm53xx/patches-3.18/082-03-USB-bcma-use-devm_kzalloc.patch | |
| parent | 8a170b96acd4e042d654138e7a7b1be2912e78bc (diff) | |
| download | upstream-fb582172ad8291c7cd4d015f1606b1f31fd4485a.tar.gz upstream-fb582172ad8291c7cd4d015f1606b1f31fd4485a.tar.bz2 upstream-fb582172ad8291c7cd4d015f1606b1f31fd4485a.zip | |
bcm53xx: use backported versions of bcma USB patches
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@49297 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/bcm53xx/patches-3.18/082-03-USB-bcma-use-devm_kzalloc.patch')
| -rw-r--r-- | target/linux/bcm53xx/patches-3.18/082-03-USB-bcma-use-devm_kzalloc.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/target/linux/bcm53xx/patches-3.18/082-03-USB-bcma-use-devm_kzalloc.patch b/target/linux/bcm53xx/patches-3.18/082-03-USB-bcma-use-devm_kzalloc.patch new file mode 100644 index 0000000000..007af3e840 --- /dev/null +++ b/target/linux/bcm53xx/patches-3.18/082-03-USB-bcma-use-devm_kzalloc.patch @@ -0,0 +1,48 @@ +From c27da2b22b558390acc515e71e47b1b307f85d5a Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens <hauke@hauke-m.de> +Date: Thu, 11 Jun 2015 22:57:37 +0200 +Subject: [PATCH] USB: bcma: use devm_kzalloc + +Instead of manually handling the frees use devm. There was also a free +missing in the unregister call which is not needed with devm. + +Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/usb/host/bcma-hcd.c | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +--- 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_de + if (dma_set_mask_and_coherent(dev->dma_dev, DMA_BIT_MASK(32))) + return -EOPNOTSUPP; + +- usb_dev = kzalloc(sizeof(struct bcma_hcd_device), GFP_KERNEL); ++ usb_dev = devm_kzalloc(&dev->dev, sizeof(struct bcma_hcd_device), ++ GFP_KERNEL); + if (!usb_dev) + return -ENOMEM; + +@@ -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); +- if (IS_ERR(usb_dev->ohci_dev)) { +- err = PTR_ERR(usb_dev->ohci_dev); +- goto err_free_usb_dev; +- } ++ if (IS_ERR(usb_dev->ohci_dev)) ++ return PTR_ERR(usb_dev->ohci_dev); + + 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_de + + err_unregister_ohci_dev: + platform_device_unregister(usb_dev->ohci_dev); +-err_free_usb_dev: +- kfree(usb_dev); + return err; + } + |