Commit fb50aacd authored Jan 19, 2018 by Vardan Mikayelyan Committed by Felipe Balbi Mar 13, 2018

usb: dwc2: pci: Move devm_kzalloc() before platform_device_add()



After platform_device_add(), if we error out, we must do
platform_device_unregister(), which also does the put. So lets move
devm_kzalloc() to simplify error handling and avoid calling of
platform_device_unregister().

Acked-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Vardan Mikayelyan <mvardan@synopsys.com>
Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Grigor Tovmasyan <tovmasya@synopsys.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

parent a127cccd

drivers/usb/dwc2/pci.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -140,16 +140,16 @@ static int dwc2_pci_probe(struct pci_dev *pci,
		if (ret)
		goto err;

		glue = devm_kzalloc(dev, sizeof(*glue), GFP_KERNEL);
		if (!glue)
		return -ENOMEM;

		ret = platform_device_add(dwc2);
		if (ret) {
		dev_err(dev, "failed to register dwc2 device\n");
		goto err;
		}

		glue = devm_kzalloc(dev, sizeof(*glue), GFP_KERNEL);
		if (!glue)
		return -ENOMEM;

		glue->phy = phy;
		glue->dwc2 = dwc2;
		pci_set_drvdata(pci, glue);

Admin message