summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-06-06 21:53:04 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-06-08 14:26:22 -0700
commitb0a252ed983b8e6339e01749029749adbaa890de (patch)
tree60f41f631bd6e7bc8a0bbc2d8f8b8852e9fd09c6 /drivers/usb
parent87997195e341f2ca175e793460a66f5170f76921 (diff)
downloadlinux-b0a252ed983b8e6339e01749029749adbaa890de.tar.bz2
USB: ssb: 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>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/ssb-hcd.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/usb/host/ssb-hcd.c b/drivers/usb/host/ssb-hcd.c
index 623cb0ba4160..62b6b7804c66 100644
--- a/drivers/usb/host/ssb-hcd.c
+++ b/drivers/usb/host/ssb-hcd.c
@@ -166,7 +166,8 @@ static int ssb_hcd_probe(struct ssb_device *dev,
if (dma_set_mask_and_coherent(dev->dma_dev, DMA_BIT_MASK(32)))
return -EOPNOTSUPP;
- usb_dev = kzalloc(sizeof(struct ssb_hcd_device), GFP_KERNEL);
+ usb_dev = devm_kzalloc(dev->dev, sizeof(struct ssb_hcd_device),
+ GFP_KERNEL);
if (!usb_dev)
return -ENOMEM;
@@ -181,10 +182,8 @@ static int ssb_hcd_probe(struct ssb_device *dev,
start = ssb_admatch_base(tmp);
len = (coreid == SSB_DEV_USB20_HOST) ? 0x800 : ssb_admatch_size(tmp);
usb_dev->ohci_dev = ssb_hcd_create_pdev(dev, true, start, len);
- 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);
if (coreid == SSB_DEV_USB20_HOST) {
start = ssb_admatch_base(tmp) + 0x800; /* ehci core offset */
@@ -200,8 +199,6 @@ static int ssb_hcd_probe(struct ssb_device *dev,
err_unregister_ohci_dev:
platform_device_unregister(usb_dev->ohci_dev);
-err_free_usb_dev:
- kfree(usb_dev);
return err;
}