Commit 045dfdb5 authored by Julia Lawall's avatar Julia Lawall Committed by Florian Tobias Schandinat
Browse files

drivers/video/ep93xx-fb.c: clean up error-handling code 



There were two problems in this code: failure of the setup function should
free locally allocated resources like other nearby failures, and the test
if (&info->cmap) can never be false.  To generally clean things up, this
patch reorders the error handling code at the failed label and adds labels
so that the conditionals are not necessary.

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Acked-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarRyan Mallon <rmallon@gmail.com>
Signed-off-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
parent 49a8ee8a

drivers/video/ep93xx-fb.c

+17 −15
Original line number Diff line number Diff line
@@ -507,16 +507,16 @@ static int __devinit ep93xxfb_probe(struct platform_device *pdev) 


	err = fb_alloc_cmap(&info->cmap, 256, 0);

	if (err)

		goto failed;

		goto failed_cmap;



	err = ep93xxfb_alloc_videomem(info);

	if (err)

		goto failed;

		goto failed_videomem;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		err = -ENXIO;

		goto failed;

		goto failed_resource;

	}



	/*
@@ -532,7 +532,7 @@ static int __devinit ep93xxfb_probe(struct platform_device *pdev) 
	fbi->mmio_base = ioremap(res->start, resource_size(res));

	if (!fbi->mmio_base) {

		err = -ENXIO;

		goto failed;

		goto failed_resource;

	}



	strcpy(info->fix.id, pdev->name);
@@ -553,24 +553,24 @@ static int __devinit ep93xxfb_probe(struct platform_device *pdev) 
	if (err == 0) {

		dev_err(info->dev, "No suitable video mode found\n");

		err = -EINVAL;

		goto failed;

		goto failed_mode;

	}



	if (mach_info->setup) {

		err = mach_info->setup(pdev);

		if (err)

			return err;

			goto failed_mode;

	}



	err = ep93xxfb_check_var(&info->var, info);

	if (err)

		goto failed;

		goto failed_check;



	fbi->clk = clk_get(info->dev, NULL);

	if (IS_ERR(fbi->clk)) {

		err = PTR_ERR(fbi->clk);

		fbi->clk = NULL;

		goto failed;

		goto failed_check;

	}



	ep93xxfb_set_par(info);
@@ -585,15 +585,17 @@ static int __devinit ep93xxfb_probe(struct platform_device *pdev) 
	return 0;



failed:

	if (fbi->clk)

	clk_put(fbi->clk);

	if (fbi->mmio_base)

failed_check:

	if (fbi->mach_info->teardown)

		fbi->mach_info->teardown(pdev);

failed_mode:

	iounmap(fbi->mmio_base);

failed_resource:

	ep93xxfb_dealloc_videomem(info);

	if (&info->cmap)

failed_videomem:

	fb_dealloc_cmap(&info->cmap);

	if (fbi->mach_info->teardown)

		fbi->mach_info->teardown(pdev);

failed_cmap:

	kfree(info);

	platform_set_drvdata(pdev, NULL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE