nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

drm/hyperv: Fix an error handling path in hyperv_vmbus_probe()

Browse source 
hyperv_setup_vram() calls vmbus_allocate_mmio(). This must be undone in
the error handling path of the probe, as already done in the remove
function.

Fixes: a0ab5abced ("drm/hyperv : Removing the restruction of VRAM allocation with PCI bar size")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Michael Kelley <mikelley@microsoft.com>
Link: https://lore.kernel.org/r/7dfa372af3e35fbb1d6f157183dfef2e4512d3be.1659297696.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Wei Liu <wei.liu@kernel.org>
This commit is contained in:
Christophe JAILLET 2022-07-31 22:01:55 +02:00 committed by Wei Liu
parent 568035b01c
commit f1f63cbb70
1 changed files with 4 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/gpu/drm/hyperv/hyperv_drm_drv.c
View file

@ -133,7 +133,6 @@ static int hyperv_vmbus_probe(struct hv_device *hdev,
} }
ret = hyperv_setup_vram(hv, hdev); ret = hyperv_setup_vram(hv, hdev);
if (ret) if (ret)
goto err_vmbus_close; goto err_vmbus_close;
@ -150,18 +149,20 @@ static int hyperv_vmbus_probe(struct hv_device *hdev,
ret = hyperv_mode_config_init(hv); ret = hyperv_mode_config_init(hv);
if (ret) if (ret)
goto err_vmbus_close; goto err_free_mmio;
ret = drm_dev_register(dev, 0); ret = drm_dev_register(dev, 0);
if (ret) { if (ret) {
drm_err(dev, "Failed to register drm driver.\n"); drm_err(dev, "Failed to register drm driver.\n");
goto err_vmbus_close; goto err_free_mmio;
} }
drm_fbdev_generic_setup(dev, 0); drm_fbdev_generic_setup(dev, 0);
return 0; return 0;
err_free_mmio:
vmbus_free_mmio(hv->mem->start, hv->fb_size);
err_vmbus_close: err_vmbus_close:
vmbus_close(hdev->channel); vmbus_close(hdev->channel);
err_hv_set_drv_data: err_hv_set_drv_data: