diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-11-11 18:15:22 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-11-11 18:15:22 +0300 |
| commit | a04dae9eb15a2629de75c4ddde44e677a356f93a (patch) | |
| tree | b7e4b1a0983c4882abbdba09107c09836e0ee0f0 /drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | |
| parent | 4ce8e6a51abfc69bf222f676cfe938f7732385d7 (diff) | |
| parent | f336c3f072216a16187b22069681d014dcb43db6 (diff) | |
| download | linux-a04dae9eb15a2629de75c4ddde44e677a356f93a.tar.xz | |
Merge branch 'topic/restize-docs' into for-next
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c index 278708f5a744..9fa809876339 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c @@ -239,6 +239,7 @@ int amdgpu_irq_init(struct amdgpu_device *adev) if (r) { adev->irq.installed = false; flush_work(&adev->hotplug_work); + cancel_work_sync(&adev->reset_work); return r; } @@ -264,6 +265,7 @@ void amdgpu_irq_fini(struct amdgpu_device *adev) if (adev->irq.msi_enabled) pci_disable_msi(adev->pdev); flush_work(&adev->hotplug_work); + cancel_work_sync(&adev->reset_work); } for (i = 0; i < AMDGPU_MAX_IRQ_SRC_ID; ++i) { |