diff options
author | Pavel Pisa <ppisa@pikron.com> | 2006-01-07 05:44:32 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 05:44:32 -0500 |
commit | f99c89297cd6995ccad6394c87383941c2570fe9 (patch) | |
tree | aea6fffb764b943e3343c0d3259262461f92d7b1 /drivers/video | |
parent | 5b2e98cdf3a6ac6c57de6a2156c673d4b0262684 (diff) |
[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: 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>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/imxfb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c index 5924cc225c95..1718baaeed2a 100644 --- a/drivers/video/imxfb.c +++ b/drivers/video/imxfb.c | |||
@@ -554,7 +554,7 @@ static int __init imxfb_probe(struct platform_device *pdev) | |||
554 | 554 | ||
555 | inf = pdev->dev.platform_data; | 555 | inf = pdev->dev.platform_data; |
556 | if(!inf) { | 556 | if(!inf) { |
557 | dev_err(dev,"No platform_data available\n"); | 557 | dev_err(&pdev->dev,"No platform_data available\n"); |
558 | return -ENOMEM; | 558 | return -ENOMEM; |
559 | } | 559 | } |
560 | 560 | ||
@@ -579,7 +579,7 @@ static int __init imxfb_probe(struct platform_device *pdev) | |||
579 | if (!inf->fixed_screen_cpu) { | 579 | if (!inf->fixed_screen_cpu) { |
580 | ret = imxfb_map_video_memory(info); | 580 | ret = imxfb_map_video_memory(info); |
581 | if (ret) { | 581 | if (ret) { |
582 | dev_err(dev, "Failed to allocate video RAM: %d\n", ret); | 582 | dev_err(&pdev->dev, "Failed to allocate video RAM: %d\n", ret); |
583 | ret = -ENOMEM; | 583 | ret = -ENOMEM; |
584 | goto failed_map; | 584 | goto failed_map; |
585 | } | 585 | } |
@@ -608,7 +608,7 @@ static int __init imxfb_probe(struct platform_device *pdev) | |||
608 | imxfb_set_par(info); | 608 | imxfb_set_par(info); |
609 | ret = register_framebuffer(info); | 609 | ret = register_framebuffer(info); |
610 | if (ret < 0) { | 610 | if (ret < 0) { |
611 | dev_err(dev, "failed to register framebuffer\n"); | 611 | dev_err(&pdev->dev, "failed to register framebuffer\n"); |
612 | goto failed_register; | 612 | goto failed_register; |
613 | } | 613 | } |
614 | 614 | ||