Commit bbf2e92f authored Mar 20, 2015 by Alexandre Courbot Committed by Ben Skeggs Apr 14, 2015

drm/nouveau/platform: fix probe error path



A "return 0" found its way in the middle of the error path of
nouveau_platform_probe(), remove it as it will make the kernel crash if
we try to unload the module afterwards.

While we are at it, also remove the IOMMU domain if it has been created,
as we should.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

parent 25eb3a92

drivers/gpu/drm/nouveau/nouveau_platform.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -209,10 +209,9 @@ static int nouveau_platform_probe(struct platform_device *pdev)
		err_unref:
		drm_dev_unref(drm);

		return 0;

		power_down:
		nouveau_platform_power_down(gpu);
		nouveau_platform_remove_iommu(&pdev->dev, gpu);

		return err;
		}