]> err.no Git - linux-2.6/commitdiff
[ARM] 3232/1: i.MX Frame Buffer undeclared "dev" variable fix
authorPavel Pisa <ppisa@pikron.com>
Sat, 7 Jan 2006 10:44:32 +0000 (10:44 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 7 Jan 2006 10:44:32 +0000 (10:44 +0000)
Patch from Pavel Pisa

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

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
drivers/video/imxfb.c

index 5924cc225c95d2f736935a3eb11744e46e17df29..1718baaeed2a6b2271135d6bda6358c333f839c9 100644 (file)
@@ -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;
        }