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

Commit 2ddcc982 authored by Andi Shyti's avatar Andi Shyti Committed by Chris Wilson
Browse files

drm/i915: fix wrong error number report 



During driver load it's considered that the i915_driver_create()
function fails only in case of insufficient memory. Indeed, in
case of failure of i915_driver_create(), the load function
returns indiscriminately -ENOMEM ignoring the real cause of
failure.

In i915_driver_create() get the consistent error value from
drm_dev_init() and embed it in the pointer return value.

Signed-off-by: default avatarAndi Shyti <andi.shyti@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20181002092047.14705-1-andi.shyti@intel.com
parent c0a6aa7e

drivers/gpu/drm/i915/i915_drv.c

+7 −5
Original line number Diff line number Diff line
@@ -1627,14 +1627,16 @@ i915_driver_create(struct pci_dev *pdev, const struct pci_device_id *ent) 
		(struct intel_device_info *)ent->driver_data;

	struct intel_device_info *device_info;

	struct drm_i915_private *i915;

	int err;



	i915 = kzalloc(sizeof(*i915), GFP_KERNEL);

	if (!i915)

		return NULL;

		return ERR_PTR(-ENOMEM);



	if (drm_dev_init(&i915->drm, &driver, &pdev->dev)) {

	err = drm_dev_init(&i915->drm, &driver, &pdev->dev);

	if (err) {

		kfree(i915);

		return NULL;

		return ERR_PTR(err);

	}



	i915->drm.pdev = pdev;
@@ -1683,8 +1685,8 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent) 
	int ret;



	dev_priv = i915_driver_create(pdev, ent);

	if (!dev_priv)

		return -ENOMEM;

	if (IS_ERR(dev_priv))

		return PTR_ERR(dev_priv);



	/* Disable nuclear pageflip by default on pre-ILK */

	if (!i915_modparams.nuclear_pageflip && match_info->gen < 5)