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

Commit 9e1f6349 authored by Manu Gautam's avatar Manu Gautam
Browse files

usb: phy: msm: Don't destroy_workqueue if wq not allocated 



There is a possibility in existing code where destroy_workqueue
might be called even if wq is not allocated. Fix the error
handling path in probe function to handle this.

Change-Id: I447a7c284202281508eb74336fe8f3061d2e3daf
Signed-off-by: default avatarManu Gautam <mgautam@codeaurora.org>
parent a660e4d0

drivers/usb/phy/phy-msm-usb.c

+4 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2009-2015, Linux Foundation. All rights reserved.

/* Copyright (c) 2009-2016, Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -4531,7 +4531,7 @@ static int msm_otg_probe(struct platform_device *pdev) 
					"msm_otg", motg);

	if (ret) {

		dev_err(&pdev->dev, "request irq failed\n");

		goto destroy_wlock;

		goto destroy_wq;

	}



	motg->phy_irq = platform_get_irq_byname(pdev, "phy_irq");
@@ -4770,11 +4770,12 @@ free_phy_irq: 
		free_irq(motg->phy_irq, motg);

free_irq:

	free_irq(motg->irq, motg);

destroy_wq:

	destroy_workqueue(motg->otg_wq);

destroy_wlock:

	wake_lock_destroy(&motg->wlock);

	clk_disable_unprepare(motg->core_clk);

	msm_hsusb_ldo_enable(motg, USB_PHY_REG_OFF);

	destroy_workqueue(motg->otg_wq);

free_ldo_init:

	msm_hsusb_ldo_init(motg, 0);

free_hsusb_vdd: