From: Sasha Levin <sashal@kernel.org>
Date: Sun, 22 Oct 2023 23:09:45 +0000 (-0400)
Subject: Fixes for 4.19
X-Git-Tag: v4.14.328~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=40415f47b92056010b7df22d449a47e2b2591573;p=thirdparty%2Fkernel%2Fstable-queue.git

Fixes for 4.19

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/queue-4.19/phy-mapphone-mdm6600-fix-runtime-pm-for-remove.patch b/queue-4.19/phy-mapphone-mdm6600-fix-runtime-pm-for-remove.patch
new file mode 100644
index 00000000000..287ac0663e1
--- /dev/null
+++ b/queue-4.19/phy-mapphone-mdm6600-fix-runtime-pm-for-remove.patch
@@ -0,0 +1,40 @@
+From 10d8a80640aebcee6cbc6f1773339f54e0720246 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 13 Sep 2023 09:04:28 +0300
+Subject: phy: mapphone-mdm6600: Fix runtime PM for remove
+
+From: Tony Lindgren <tony@atomide.com>
+
+[ Upstream commit b99e0ba9633af51638e5ee1668da2e33620c134f ]
+
+Otherwise we will get an underflow on remove.
+
+Cc: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
+Cc: Merlijn Wajer <merlijn@wizzup.org>
+Cc: Pavel Machek <pavel@ucw.cz>
+Cc: Sebastian Reichel <sre@kernel.org>
+Fixes: f7f50b2a7b05 ("phy: mapphone-mdm6600: Add runtime PM support for n_gsm on USB suspend")
+Signed-off-by: Tony Lindgren <tony@atomide.com>
+Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
+Link: https://lore.kernel.org/r/20230913060433.48373-2-tony@atomide.com
+Signed-off-by: Vinod Koul <vkoul@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/phy/motorola/phy-mapphone-mdm6600.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/phy/motorola/phy-mapphone-mdm6600.c b/drivers/phy/motorola/phy-mapphone-mdm6600.c
+index 77518010adc88..44ad15ca881ee 100644
+--- a/drivers/phy/motorola/phy-mapphone-mdm6600.c
++++ b/drivers/phy/motorola/phy-mapphone-mdm6600.c
+@@ -612,6 +612,7 @@ static int phy_mdm6600_remove(struct platform_device *pdev)
+ 	struct phy_mdm6600 *ddata = platform_get_drvdata(pdev);
+ 	struct gpio_desc *reset_gpio = ddata->ctrl_gpios[PHY_MDM6600_RESET];
+ 
++	pm_runtime_get_noresume(ddata->dev);
+ 	pm_runtime_dont_use_autosuspend(ddata->dev);
+ 	pm_runtime_put_sync(ddata->dev);
+ 	pm_runtime_disable(ddata->dev);
+-- 
+2.42.0
+
diff --git a/queue-4.19/series b/queue-4.19/series
index 60d895ef5b7..4a15548be53 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -96,3 +96,4 @@ perf-disallow-mis-matched-inherited-group-reads.patch
 s390-pci-fix-iommu-bitmap-allocation.patch
 gpio-vf610-set-value-before-the-direction-to-avoid-a-glitch.patch
 asoc-pxa-fix-a-memory-leak-in-probe.patch
+phy-mapphone-mdm6600-fix-runtime-pm-for-remove.patch