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

Commit ef51573b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ehci-hsic: Don't change DEVICE name from driver"

parents 8d2db795 3a5838da

drivers/usb/host/ehci-msm-hsic.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -1951,7 +1951,6 @@ static int ehci_hsic_msm_probe(struct platform_device *pdev) 
	if (pdev->dev.of_node) {

	if (pdev->dev.of_node) {

		dev_dbg(&pdev->dev, "device tree enabled\n");

		dev_dbg(&pdev->dev, "device tree enabled\n");

		pdev->dev.platform_data = msm_hsic_dt_to_pdata(pdev);

		pdev->dev.platform_data = msm_hsic_dt_to_pdata(pdev);

		dev_set_name(&pdev->dev, ehci_msm_hsic_driver.driver.name);

	} else {

	} else {

		/* explicitly pass wakeup_irq flag for !DT */

		/* explicitly pass wakeup_irq flag for !DT */

		wakeup_irq_flags = IRQF_TRIGGER_HIGH;

		wakeup_irq_flags = IRQF_TRIGGER_HIGH;