Skip to contentSkip to conversation

Patch "usb: dwc3: exynos fix axius clock error path to do cleanup" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jun 18, 2017

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

usb: dwc3: exynos fix axius clock error path to do cleanup

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
usb-dwc3-exynos-fix-axius-clock-error-path-to-do-cleanup.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 8ae584d1951f241efd45499f8774fd7066f22823 Mon Sep 17 00:00:00 2001

From: Shuah Khan <[email protected]>
Date: Tue, 10 Jan 2017 16:05:28 -0700
Subject: usb: dwc3: exynos fix axius clock error path to do cleanup

From: Shuah Khan <[email protected]>

commit 8ae584d1951f241efd45499f8774fd7066f22823 upstream.

Axius clock error path returns without disabling clock and suspend clock. Fix it to disable them before returning error.

---
 drivers/usb/dwc3/dwc3-exynos.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/dwc3/dwc3-exynos.c +3 -1
@@ -148,7 +148,8 @@ static int dwc3_exynos_probe(struct plat
 		exynos->axius_clk = devm_clk_get(dev, "usbdrd30_axius_clk");
 		if (IS_ERR(exynos->axius_clk)) {
 			dev_err(dev, "no AXI UpScaler clk specified\n");
-			return -ENODEV;
+			ret = -ENODEV;
+			goto axius_clk_err;
 		}
 		clk_prepare_enable(exynos->axius_clk);
 	} else {
@@ -206,6 +207,7 @@ err3:
 	regulator_disable(exynos->vdd33);
 err2:
 	clk_disable_unprepare(exynos->axius_clk);
+axius_clk_err:
 	clk_disable_unprepare(exynos->susp_clk);
 	clk_disable_unprepare(exynos->clk);
 	return ret;

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/usb-usbip-fix-nonconforming-hub-descriptor.patch queue-4.9/usb-dwc3-exynos-fix-axius-clock-error-path-to-do-cleanup.patch