Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02036cee authored by Imre Deak's avatar Imre Deak
Browse files

drm/i915: Sanitize i915_get_bridge_dev() error path 



Clarify the name of the label on the error path, making it clear what's
being cleaned up. The kmem_cache_destroy() calls are NOPs on the
corresponding error path.

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarDavid Weinehall <david.weinehall@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1453209992-25995-3-git-send-email-imre.deak@intel.com
parent 89250fec

drivers/gpu/drm/i915/i915_dma.c

+2 −3
Original line number Diff line number Diff line
@@ -916,7 +916,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 


	if (i915_get_bridge_dev(dev)) {

		ret = -EIO;

		goto free_priv;

		goto out_runtime_pm_put;

	}



	mmio_bar = IS_GEN2(dev) ? 1 : 0;
@@ -1121,11 +1121,10 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
	pci_iounmap(dev->pdev, dev_priv->regs);

put_bridge:

	pci_dev_put(dev_priv->bridge_dev);

free_priv:

	kmem_cache_destroy(dev_priv->requests);

	kmem_cache_destroy(dev_priv->vmas);

	kmem_cache_destroy(dev_priv->objects);



out_runtime_pm_put:

	intel_runtime_pm_put(dev_priv);



	kfree(dev_priv);