Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e18817c0 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: dwc3: Do not update the resource of platform device"

parents c853eec3 95456f28

drivers/usb/dwc3/core.c

+0 −16
Original line number Diff line number Diff line
@@ -1417,8 +1417,6 @@ static int dwc3_probe(struct platform_device *pdev) 
	dwc->xhci_resources[0].flags = res->flags;

	dwc->xhci_resources[0].name = res->name;



	res->start += DWC3_GLOBALS_REGS_START;



	irq = platform_get_irq(to_platform_device(dwc->dev), 0);



	ret = devm_request_irq(dev, irq, dwc3_interrupt, IRQF_SHARED, "dwc3",
@@ -1551,12 +1549,6 @@ static int dwc3_probe(struct platform_device *pdev) 
	}

	destroy_workqueue(dwc->dwc_wq);

err0:

	/*

	 * restore res->start back to its original value so that, in case the

	 * probe is deferred, we don't end up getting error in request the

	 * memory region the next time probe is called.

	 */

	res->start -= DWC3_GLOBALS_REGS_START;



	return ret;

}
@@ -1564,14 +1556,6 @@ static int dwc3_probe(struct platform_device *pdev) 
static int dwc3_remove(struct platform_device *pdev)

{

	struct dwc3	*dwc = platform_get_drvdata(pdev);

	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);



	/*

	 * restore res->start back to its original value so that, in case the

	 * probe is deferred, we don't end up getting error in request the

	 * memory region the next time probe is called.

	 */

	res->start -= DWC3_GLOBALS_REGS_START;



	dwc3_debugfs_exit(dwc);

	dwc3_gadget_exit(dwc);