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

Commit 93019734 authored by Manuel Lauss's avatar Manuel Lauss Committed by Florian Tobias Schandinat
Browse files

fbdev: fix au1*fb builds 



Commit 1c16697b
("drivers/video/au*fb.c: use devm_ functions) introduced 2 build failures
in the au1100fb and au1200fb drivers, fix them.

Signed-off-by: default avatarManuel Lauss <manuel.lauss@googlemail.com>
Signed-off-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
parent ef798d02

drivers/video/au1100fb.c

+3 −2
Original line number Diff line number Diff line
@@ -499,7 +499,8 @@ static int __devinit au1100fb_drv_probe(struct platform_device *dev) 
	au1100fb_fix.mmio_start = regs_res->start;

	au1100fb_fix.mmio_len = resource_size(regs_res);



	if (!devm_request_mem_region(au1100fb_fix.mmio_start,

	if (!devm_request_mem_region(&dev->dev,

				     au1100fb_fix.mmio_start,

				     au1100fb_fix.mmio_len,

				     DRIVER_NAME)) {

		print_err("fail to lock memory region at 0x%08lx",
@@ -516,7 +517,7 @@ static int __devinit au1100fb_drv_probe(struct platform_device *dev) 
	fbdev->fb_len = fbdev->panel->xres * fbdev->panel->yres *

		  	(fbdev->panel->bpp >> 3) * AU1100FB_NBR_VIDEO_BUFFERS;



	fbdev->fb_mem = dmam_alloc_coherent(&dev->dev, &dev->dev,

	fbdev->fb_mem = dmam_alloc_coherent(&dev->dev,

					    PAGE_ALIGN(fbdev->fb_len),

					    &fbdev->fb_phys, GFP_KERNEL);

	if (!fbdev->fb_mem) {

drivers/video/au1200fb.c

+1 −1
Original line number Diff line number Diff line
@@ -1724,7 +1724,7 @@ static int __devinit au1200fb_drv_probe(struct platform_device *dev) 
		/* Allocate the framebuffer to the maximum screen size */

		fbdev->fb_len = (win->w[plane].xres * win->w[plane].yres * bpp) / 8;



		fbdev->fb_mem = dmam_alloc_noncoherent(&dev->dev, &dev->dev,

		fbdev->fb_mem = dmam_alloc_noncoherent(&dev->dev,

				PAGE_ALIGN(fbdev->fb_len),

				&fbdev->fb_phys, GFP_KERNEL);

		if (!fbdev->fb_mem) {