diff options
author | Takashi Iwai <tiwai@suse.de> | 2024-12-12 14:49:35 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2024-12-12 14:49:35 +0100 |
commit | 7b26bc6582b13a52a42a4a9765e8f30d58a81198 (patch) | |
tree | 80737d9bb4abf42b8e2061a5edacdfbe5ac9b7d6 /drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | |
parent | b2e538a9827dd04ab5273bf4be8eb2edb84357b0 (diff) | |
parent | 255cc582e6e16191a20d54bcdbca6c91d3e90c5e (diff) | |
download | linux-7b26bc6582b13a52a42a4a9765e8f30d58a81198.tar.gz linux-7b26bc6582b13a52a42a4a9765e8f30d58a81198.tar.bz2 linux-7b26bc6582b13a52a42a4a9765e8f30d58a81198.zip |
Merge tag 'asoc-fix-v6.12-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.13
A small pile of driver specific fixes, all quite small and not
particularly major.
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c index 7319299f25ae..03b8b7cd5229 100644 --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c @@ -604,7 +604,7 @@ static void jpeg_v1_0_set_irq_funcs(struct amdgpu_device *adev) static void jpeg_v1_0_ring_begin_use(struct amdgpu_ring *ring) { struct amdgpu_device *adev = ring->adev; - bool set_clocks = !cancel_delayed_work_sync(&adev->jpeg.idle_work); + bool set_clocks = !cancel_delayed_work_sync(&adev->vcn.idle_work); int cnt = 0; mutex_lock(&adev->vcn.vcn1_jpeg1_workaround); |