diff options
Diffstat (limited to 'sound/soc/intel/sst/sst.c')
-rw-r--r-- | sound/soc/intel/sst/sst.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/sound/soc/intel/sst/sst.c b/sound/soc/intel/sst/sst.c index 8f938112a01f..4d8f73ac5dd9 100644 --- a/sound/soc/intel/sst/sst.c +++ b/sound/soc/intel/sst/sst.c | |||
@@ -492,21 +492,6 @@ iram: | |||
492 | return ret; | 492 | return ret; |
493 | } | 493 | } |
494 | 494 | ||
495 | static int intel_sst_runtime_resume(struct device *dev) | ||
496 | { | ||
497 | int ret = 0; | ||
498 | struct intel_sst_drv *ctx = dev_get_drvdata(dev); | ||
499 | |||
500 | if (ctx->sst_state == SST_RESET) { | ||
501 | ret = sst_load_fw(ctx); | ||
502 | if (ret) { | ||
503 | dev_err(dev, "FW download fail %d\n", ret); | ||
504 | sst_set_fw_state_locked(ctx, SST_RESET); | ||
505 | } | ||
506 | } | ||
507 | return ret; | ||
508 | } | ||
509 | |||
510 | static int intel_sst_resume(struct device *dev) | 495 | static int intel_sst_resume(struct device *dev) |
511 | { | 496 | { |
512 | struct intel_sst_drv *ctx = dev_get_drvdata(dev); | 497 | struct intel_sst_drv *ctx = dev_get_drvdata(dev); |
@@ -515,7 +500,7 @@ static int intel_sst_resume(struct device *dev) | |||
515 | struct sst_block *block; | 500 | struct sst_block *block; |
516 | 501 | ||
517 | if (!fw_save) | 502 | if (!fw_save) |
518 | return intel_sst_runtime_resume(dev); | 503 | return 0; |
519 | 504 | ||
520 | sst_set_fw_state_locked(ctx, SST_FW_LOADING); | 505 | sst_set_fw_state_locked(ctx, SST_FW_LOADING); |
521 | 506 | ||
@@ -560,6 +545,5 @@ const struct dev_pm_ops intel_sst_pm = { | |||
560 | .suspend = intel_sst_suspend, | 545 | .suspend = intel_sst_suspend, |
561 | .resume = intel_sst_resume, | 546 | .resume = intel_sst_resume, |
562 | .runtime_suspend = intel_sst_runtime_suspend, | 547 | .runtime_suspend = intel_sst_runtime_suspend, |
563 | .runtime_resume = intel_sst_runtime_resume, | ||
564 | }; | 548 | }; |
565 | EXPORT_SYMBOL_GPL(intel_sst_pm); | 549 | EXPORT_SYMBOL_GPL(intel_sst_pm); |