forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-31 f70575805708cabdedea7498aaa3f710fde4d920
kernel/sound/soc/img/img-i2s-in.c
....@@ -1,13 +1,10 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23 * IMG I2S input controller driver
34 *
45 * Copyright (C) 2015 Imagination Technologies Ltd.
56 *
67 * Author: Damien Horsley <Damien.Horsley@imgtec.com>
7
- *
8
- * This program is free software; you can redistribute it and/or modify it
9
- * under the terms and conditions of the GNU General Public License,
10
- * version 2, as published by the Free Software Foundation.
118 */
129
1310 #include <linux/clk.h>
....@@ -402,7 +399,7 @@
402399 struct snd_dmaengine_dai_dma_data *dma_data;
403400 int ret;
404401
405
- dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, st);
402
+ dma_data = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), st);
406403
407404 ret = snd_hwparams_to_dma_slave_config(st, params, sc);
408405 if (ret)
....@@ -467,7 +464,7 @@
467464 if (ret)
468465 goto err_pm_disable;
469466 }
470
- ret = pm_runtime_get_sync(&pdev->dev);
467
+ ret = pm_runtime_resume_and_get(&pdev->dev);
471468 if (ret < 0)
472469 goto err_suspend;
473470