diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2023-04-04 17:03:24 +0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2023-04-04 17:04:30 +0300 |
| commit | 692d42d411b7db6a76382537fccbee3a12a2bcdb (patch) | |
| tree | 24770529cf173188bc5d2d0d9331c0ac723b631e /sound/soc/qcom/qdsp6/q6prm.c | |
| parent | c52159b5be7894540acdc7a35791c0b57097fa4c (diff) | |
| parent | 13a0d1ae7ee6b438f5537711a8c60cba00554943 (diff) | |
| download | linux-692d42d411b7db6a76382537fccbee3a12a2bcdb.tar.xz | |
Merge branch 'iommufd/for-rc' into for-next
The following selftest patch requires both the bug fixes and the
improvements of the selftest framework.
* iommufd/for-rc:
iommufd: Do not corrupt the pfn list when doing batch carry
iommufd: Fix unpinning of pages when an access is present
iommufd: Check for uptr overflow
Linux 6.3-rc5
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'sound/soc/qcom/qdsp6/q6prm.c')
| -rw-r--r-- | sound/soc/qcom/qdsp6/q6prm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/qcom/qdsp6/q6prm.c b/sound/soc/qcom/qdsp6/q6prm.c index 3aa63aac4a68..81554d202658 100644 --- a/sound/soc/qcom/qdsp6/q6prm.c +++ b/sound/soc/qcom/qdsp6/q6prm.c @@ -184,9 +184,9 @@ int q6prm_set_lpass_clock(struct device *dev, int clk_id, int clk_attr, int clk_ unsigned int freq) { if (freq) - return q6prm_request_lpass_clock(dev, clk_id, clk_attr, clk_attr, freq); + return q6prm_request_lpass_clock(dev, clk_id, clk_attr, clk_root, freq); - return q6prm_release_lpass_clock(dev, clk_id, clk_attr, clk_attr, freq); + return q6prm_release_lpass_clock(dev, clk_id, clk_attr, clk_root, freq); } EXPORT_SYMBOL_GPL(q6prm_set_lpass_clock); |