Commit c27da2b2 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by Greg Kroah-Hartman

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: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 98e13e05
...@@ -225,7 +225,8 @@ static int bcma_hcd_probe(struct bcma_device *dev) ...@@ -225,7 +225,8 @@ static int bcma_hcd_probe(struct bcma_device *dev)
if (dma_set_mask_and_coherent(dev->dma_dev, DMA_BIT_MASK(32))) if (dma_set_mask_and_coherent(dev->dma_dev, DMA_BIT_MASK(32)))
return -EOPNOTSUPP; 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) if (!usb_dev)
return -ENOMEM; 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_device *dev)
ohci_addr = 0x18009000; ohci_addr = 0x18009000;
usb_dev->ohci_dev = bcma_hcd_create_pdev(dev, true, ohci_addr); usb_dev->ohci_dev = bcma_hcd_create_pdev(dev, true, ohci_addr);
if (IS_ERR(usb_dev->ohci_dev)) { if (IS_ERR(usb_dev->ohci_dev))
err = PTR_ERR(usb_dev->ohci_dev); return PTR_ERR(usb_dev->ohci_dev);
goto err_free_usb_dev;
}
usb_dev->ehci_dev = bcma_hcd_create_pdev(dev, false, dev->addr); usb_dev->ehci_dev = bcma_hcd_create_pdev(dev, false, dev->addr);
if (IS_ERR(usb_dev->ehci_dev)) { 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_device *dev)
err_unregister_ohci_dev: err_unregister_ohci_dev:
platform_device_unregister(usb_dev->ohci_dev); platform_device_unregister(usb_dev->ohci_dev);
err_free_usb_dev:
kfree(usb_dev);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment