[Intel-gfx] [PATCH] drm/i915: fix wrong error number report

Chris Wilson chris at chris-wilson.co.uk
Mon Oct 1 19:33:02 UTC 2018


Quoting Andi Shyti (2018-10-01 17:54:18)
> 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: Andi Shyti <andi.shyti at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 1b028f429e92..d1f65d57f4df 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -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;

Ahem.

> @@ -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);
-Chris


More information about the Intel-gfx mailing list