Merge "spi: spi-msm-geni: Put device to suspend if PM status is active" (e4bbc981) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/spi/spi-msm-geni.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1106,7 +1106,8 @@ static int spi_geni_unprepare_message(struct spi_master *spi_mas,
		GENI_SE_ERR(mas->ipc, false, NULL,
		"suspend usage count mismatch:%d",
		count);
		} else if (!pm_runtime_suspended(mas->dev)) {
		} else if (!pm_runtime_status_suspended(mas->dev) &&
		pm_runtime_enabled(mas->dev)) {
		pm_runtime_mark_last_busy(mas->dev);
		pm_runtime_put_autosuspend(mas->dev);
		}
		@@ -1421,7 +1422,8 @@ static int spi_geni_unprepare_transfer_hardware(struct spi_master *spi)
		if (count < 0)
		GENI_SE_ERR(mas->ipc, false, NULL,
		"suspend usage count mismatch:%d", count);
		} else {
		} else if (!pm_runtime_status_suspended(mas->dev) &&
		pm_runtime_enabled(mas->dev)) {
		pm_runtime_mark_last_busy(mas->dev);
		pm_runtime_put_autosuspend(mas->dev);
		}