|
|
@@ -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;
|
|
|
}
|
|
|
|