Revert "usb: chipidea: remove duplicate dev_set_drvdata for host_start" (24c498df) · Commits · 戴 / test

This reverts commit It moved platform_set_drvdata(pdev, ci) before hcd is created, and the hcd will assign itself as ci controller's drvdata during the hcd creation function (in usb_create_shared_hcd), so it overwrites the real ci's drvdata which we want to use. So, if the controller is at host mode, the system suspend API will get the wrong struct ci_hdrc pointer, and cause the oops. Signed-off-by:

Peter Chen <peter.chen@freescale.com> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/usb/chipidea/core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -669,7 +669,6 @@ static int ci_hdrc_probe(struct platform_device *pdev)
		if (!ci)
		return -ENOMEM;

		platform_set_drvdata(pdev, ci);
		ci->dev = dev;
		ci->platdata = dev_get_platdata(dev);
		ci->imx28_write_fix = !!(ci->platdata->flags &
		@@ -783,6 +782,7 @@ static int ci_hdrc_probe(struct platform_device *pdev)
		}
		}

		platform_set_drvdata(pdev, ci);
		ret = devm_request_irq(dev, ci->irq, ci_irq, IRQF_SHARED,
		ci->platdata->name, ci);
		if (ret)

drivers/usb/chipidea/host.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,7 @@ static int host_start(struct ci_hdrc *ci)
		if (!hcd)
		return -ENOMEM;

		dev_set_drvdata(ci->dev, ci);
		hcd->rsrc_start = ci->hw_bank.phys;
		hcd->rsrc_len = ci->hw_bank.size;
		hcd->regs = ci->hw_bank.abs;

Admin message