Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f99c8929 authored by Pavel Pisa's avatar Pavel Pisa Committed by Russell King
Browse files

[ARM] 3232/1: i.MX Frame Buffer undeclared "dev" variable fix 



Patch from Pavel Pisa

Correction of the code broken by update
whole-tree platform devices update.

Signed-off-by: default avatarPavel Pisa <pisa@cmp.felk.cvut.cz>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 5b2e98cd

drivers/video/imxfb.c

+3 −3
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ static int __init imxfb_probe(struct platform_device *pdev) 


	inf = pdev->dev.platform_data;

	if(!inf) {

		dev_err(dev,"No platform_data available\n");

		dev_err(&pdev->dev,"No platform_data available\n");

		return -ENOMEM;

	}
@@ -579,7 +579,7 @@ static int __init imxfb_probe(struct platform_device *pdev) 
	if (!inf->fixed_screen_cpu) {

		ret = imxfb_map_video_memory(info);

		if (ret) {

			dev_err(dev, "Failed to allocate video RAM: %d\n", ret);

			dev_err(&pdev->dev, "Failed to allocate video RAM: %d\n", ret);

			ret = -ENOMEM;

			goto failed_map;

		}
@@ -608,7 +608,7 @@ static int __init imxfb_probe(struct platform_device *pdev) 
	imxfb_set_par(info);

	ret = register_framebuffer(info);

	if (ret < 0) {

		dev_err(dev, "failed to register framebuffer\n");

		dev_err(&pdev->dev, "failed to register framebuffer\n");

		goto failed_register;

	}