Commit b3f91eb8 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAP: DSS2: OMAPFB: fix dssdev cleanup on error 



If there was a dss device without a driver and thus omapfb probe failed,
ref counts could be left to dss devices.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@nokia.com>
parent c121b152

drivers/video/omap2/omapfb/omapfb-main.c

+7 −2
Original line number Original line Diff line number Diff line
@@ -2111,18 +2111,23 @@ static int omapfb_probe(struct platform_device *pdev) 
	fbdev->dev = &pdev->dev;

	fbdev->dev = &pdev->dev;

	platform_set_drvdata(pdev, fbdev);

	platform_set_drvdata(pdev, fbdev);





	r = 0;

	fbdev->num_displays = 0;

	fbdev->num_displays = 0;

	dssdev = NULL;

	dssdev = NULL;

	for_each_dss_dev(dssdev) {

	for_each_dss_dev(dssdev) {

		omap_dss_get_device(dssdev);

		omap_dss_get_device(dssdev);



		if (!dssdev->driver) {

		if (!dssdev->driver) {

			dev_err(&pdev->dev, "no driver for display\n");

			dev_err(&pdev->dev, "no driver for display\n");

			r = -EINVAL;

			r = -ENODEV;

			goto cleanup;

		}

		}



		fbdev->displays[fbdev->num_displays++] = dssdev;

		fbdev->displays[fbdev->num_displays++] = dssdev;

	}

	}





	if (r)

		goto cleanup;



	if (fbdev->num_displays == 0) {

	if (fbdev->num_displays == 0) {

		dev_err(&pdev->dev, "no displays\n");

		dev_err(&pdev->dev, "no displays\n");

		r = -EINVAL;

		r = -EINVAL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE