The remove() function calls bochs_hw_fini() but this function is not called in the error handling of the probe.
This call releases the resources allocated by bochs_hw_init() used in bochs_load().
Update the probe and bochs_load() to call bochs_hw_fini() if an error occurs after a successful bochs_hw_init() call.
Signed-off-by: Christophe JAILLET christophe.jaillet@wanadoo.fr --- I've not been able to find a Fixes: tag because of code re-arrangement done in 796c3e35ac16. --- drivers/gpu/drm/tiny/bochs.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/tiny/bochs.c b/drivers/gpu/drm/tiny/bochs.c index 4f8bf86633df..d7a34ed4be3e 100644 --- a/drivers/gpu/drm/tiny/bochs.c +++ b/drivers/gpu/drm/tiny/bochs.c @@ -581,13 +581,17 @@ static int bochs_load(struct drm_device *dev)
ret = drmm_vram_helper_init(dev, bochs->fb_base, bochs->fb_size); if (ret) - return ret; + goto err_hw_fini;
ret = bochs_kms_init(bochs); if (ret) - return ret; + goto err_hw_fini;
return 0; + +err_hw_fini: + bochs_hw_fini(dev); + return ret; }
DEFINE_DRM_GEM_FOPS(bochs_fops); @@ -662,11 +666,13 @@ static int bochs_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent
ret = drm_dev_register(dev, 0); if (ret) - goto err_free_dev; + goto err_hw_fini;
drm_fbdev_generic_setup(dev, 32); return ret;
+err_hw_fini: + bochs_hw_fini(dev); err_free_dev: drm_dev_put(dev); return ret;