drm/i915: Fix i915_driver_init_mmio error path
authorMichal Wajdeczko <[email protected]>
Thu, 11 Oct 2018 13:00:07 +0000 (13:00 +0000)
committerChris Wilson <[email protected]>
Thu, 11 Oct 2018 20:06:42 +0000 (21:06 +0100)
In case of the error we missed to call i915_mmio_cleanup
that matches earlier call to i915_mmio_setup.

Signed-off-by: Michal Wajdeczko <[email protected]>
Cc: Joonas Lahtinen <[email protected]>
Cc: Chris Wilson <[email protected]>
Reviewed-by: Mika Kuoppala <[email protected]>
Reviewed-by: Chris Wilson <[email protected]>
Signed-off-by: Chris Wilson <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
drivers/gpu/drm/i915/i915_drv.c

index 193023427b40e5daea70f1342943c125cd33c7a5..baac35f698f985e5c40b326cf716cc277e8a9909 100644 (file)
@@ -1030,6 +1030,7 @@ static int i915_driver_init_mmio(struct drm_i915_private *dev_priv)
 
 err_uncore:
        intel_uncore_fini(dev_priv);
+       i915_mmio_cleanup(dev_priv);
 err_bridge:
        pci_dev_put(dev_priv->bridge_dev);