Commit 718551bb authored by Matt Roper's avatar Matt Roper
Browse files

drm/i915: Fix error handling if driver creation fails during probe 



If i915_driver_create() fails to create a valid 'i915' object, we
should just disable the PCI device and return immediately without trying
to call i915_probe_error() that relies on a valid i915 pointer.

Fixes: 12e6f6dc ("drm/i915/display: Handle GMD_ID identification in display code")
Reported-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/all/55236f93-dcc5-481e-b788-9f7e95b129d8@kili.mountain/


Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarGustavo Sousa <gustavo.sousa@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230601173804.557756-1-matthew.d.roper@intel.com
parent 2d0cdf60

drivers/gpu/drm/i915/i915_driver.c

+2 −2
Original line number Diff line number Diff line
@@ -762,8 +762,8 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	i915 = i915_driver_create(pdev, ent);

	if (IS_ERR(i915)) {

		ret = PTR_ERR(i915);

		goto out_pci_disable;

		pci_disable_device(pdev);

		return PTR_ERR(i915);

	}



	ret = i915_driver_early_probe(i915);