Home Home > GIT Browse > openSUSE-15.1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-05-13 15:54:15 +0200
committerTakashi Iwai <tiwai@suse.de>2019-05-15 11:46:08 +0200
commit569b4a95c32336656d159686b4ca99a933792d8c (patch)
treee6b821e38c9d0c073a6b20c659ddd0ec7ca08313
parent70671fe95cb836e45074889e78f8a52717d2e3aa (diff)
spi: Add missing pm_runtime_put_noidle() after failed get
(bsc#1111666).
-rw-r--r--patches.drivers/spi-Add-missing-pm_runtime_put_noidle-after-failed-g.patch35
-rw-r--r--series.conf1
2 files changed, 36 insertions, 0 deletions
diff --git a/patches.drivers/spi-Add-missing-pm_runtime_put_noidle-after-failed-g.patch b/patches.drivers/spi-Add-missing-pm_runtime_put_noidle-after-failed-g.patch
new file mode 100644
index 0000000000..8bb8250f9d
--- /dev/null
+++ b/patches.drivers/spi-Add-missing-pm_runtime_put_noidle-after-failed-g.patch
@@ -0,0 +1,35 @@
+From 7e48e23a1f4a50f93ac1073f1326e0a73829b631 Mon Sep 17 00:00:00 2001
+From: Tony Lindgren <tony@atomide.com>
+Date: Fri, 18 May 2018 10:30:07 -0700
+Subject: [PATCH] spi: Add missing pm_runtime_put_noidle() after failed get
+Git-commit: 7e48e23a1f4a50f93ac1073f1326e0a73829b631
+Patch-mainline: v4.18-rc1
+References: bsc#1111666
+
+If pm_runtime_get_sync() fails we should call pm_runtime_put_noidle().
+This is probably not a critical fix as we should only hit this when
+things are broken elsewhere.
+
+Signed-off-by: Tony Lindgren <tony@atomide.com>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/spi/spi.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
+index 8ee1ba13eb23..20b5b2754830 100644
+--- a/drivers/spi/spi.c
++++ b/drivers/spi/spi.c
+@@ -1212,6 +1212,7 @@ static void __spi_pump_messages(struct spi_controller *ctlr, bool in_kthread)
+ if (!was_busy && ctlr->auto_runtime_pm) {
+ ret = pm_runtime_get_sync(ctlr->dev.parent);
+ if (ret < 0) {
++ pm_runtime_put_noidle(ctlr->dev.parent);
+ dev_err(&ctlr->dev, "Failed to power device: %d\n",
+ ret);
+ mutex_unlock(&ctlr->io_mutex);
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 366c144454..b6f7dafcab 100644
--- a/series.conf
+++ b/series.conf
@@ -30465,6 +30465,7 @@
patches.drivers/0009-spi-Extend-the-core-to-ease-integration-of-SPI-memor.patch
patches.drivers/0010-spi-Make-support-for-regular-transfers-optional-when.patch
patches.drivers/0043-mtd-spi-nor-Use-the-spi_mem_xx-API.patch
+ patches.drivers/spi-Add-missing-pm_runtime_put_noidle-after-failed-g.patch
patches.drivers/0044-mtd-devices-m25p80-Use-spi_mem_set_drvdata-instead-o.patch
patches.drivers/regmap-skip-clk_put-for-attached-clocks-when-freeing-context
patches.suse/0001-btrfs-qgroup-Search-commit-root-for-rescan-to-avoid-.patch