mirror of
git://git.yoctoproject.org/linux-yocto.git
synced 2025-10-22 23:13:01 +02:00
drm/xe: Fix error handling in xe_irq_install()
When devm_add_action_or_reset() fails, it already calls the function passed as parameter and that function is already free'ing the irqs. Drop the goto and just return. The caller, xe_device_probe(), should also do the same thing instead of wrongly doing `goto err` and calling the unrelated xe_display_fini() function. Fixes:14d25d8d68("drm/xe: change old msi irq api to a new one") Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20250213192909.996148-3-lucas.demarchi@intel.com Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> (cherry picked from commit121b214cdf) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
This commit is contained in:
parent
0ad2507d5d
commit
0c455f3a12
|
|
@ -757,19 +757,7 @@ int xe_irq_install(struct xe_device *xe)
|
|||
|
||||
xe_irq_postinstall(xe);
|
||||
|
||||
err = devm_add_action_or_reset(xe->drm.dev, irq_uninstall, xe);
|
||||
if (err)
|
||||
goto free_irq_handler;
|
||||
|
||||
return 0;
|
||||
|
||||
free_irq_handler:
|
||||
if (xe_device_has_msix(xe))
|
||||
xe_irq_msix_free(xe);
|
||||
else
|
||||
xe_irq_msi_free(xe);
|
||||
|
||||
return err;
|
||||
return devm_add_action_or_reset(xe->drm.dev, irq_uninstall, xe);
|
||||
}
|
||||
|
||||
static void xe_irq_msi_synchronize_irq(struct xe_device *xe)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user