Commit db484889 authored by Jason Ekstrand's avatar Jason Ekstrand Committed by Daniel Vetter

drm/i915: Call i915_globals_exit() if pci_register_device() fails

In the unlikely event that pci_register_device() fails, we were tearing
down our PMU setup but not globals.  This leaves a bunch of memory slabs
lying around.
Signed-off-by: default avatarJason Ekstrand <jason@jlekstrand.net>
Fixes: 32eb6bcf ("drm/i915: Make request allocation caches global")
[danvet: Fix conflicts against removal of the globals_flush
infrastructure.]
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210721152358.2893314-3-jason@jlekstrand.net
parent 75d3bf84
......@@ -59,7 +59,7 @@ int __init i915_globals_init(void)
return 0;
}
void __exit i915_globals_exit(void)
void i915_globals_exit(void)
{
__i915_globals_cleanup();
}
......@@ -1195,6 +1195,7 @@ static int __init i915_init(void)
err = pci_register_driver(&i915_pci_driver);
if (err) {
i915_pmu_exit();
i915_globals_exit();
return err;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment