niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/i915/drv: return -EIO instead of -1

Browse source 
Avoid using the incidental -EPERM. Return the -EIO directly from
i915_get_bridge_dev() instead of converting return values later.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1ee72c31963d8be98490cd78f7c1182ba4f54c13.1633000838.git.jani.nikula@intel.com
This commit is contained in:
Jani Nikula 2021-09-30 14:24:35 +03:00
parent 0743019d54
commit 5e9a0200da
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/gpu/drm/i915/i915_drv.c
View file

@ -97,7 +97,7 @@ static int i915_get_bridge_dev(struct drm_i915_private *dev_priv)
pci_get_domain_bus_and_slot(domain, 0, PCI_DEVFN(0, 0)); pci_get_domain_bus_and_slot(domain, 0, PCI_DEVFN(0, 0));
if (!dev_priv->bridge_dev) { if (!dev_priv->bridge_dev) {
drm_err(&dev_priv->drm, "bridge device not found\n"); drm_err(&dev_priv->drm, "bridge device not found\n");
return -1; return -EIO;
} }
return 0; return 0;
} }
@ -409,8 +409,9 @@ static int i915_driver_mmio_probe(struct drm_i915_private *dev_priv)
if (i915_inject_probe_failure(dev_priv)) if (i915_inject_probe_failure(dev_priv))
return -ENODEV; return -ENODEV;
if (i915_get_bridge_dev(dev_priv)) ret = i915_get_bridge_dev(dev_priv);
return -EIO; if (ret < 0)
return ret;
ret = intel_uncore_init_mmio(&dev_priv->uncore); ret = intel_uncore_init_mmio(&dev_priv->uncore);
if (ret < 0) if (ret < 0)