Commit aababb97 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fbdev-fixes-for-linus' of... 

Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x

* 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x:
  vesafb: fix memory leak
  fbdev: amba: Link fb device to its parent
  fsl-diu-fb: remove check for pixel clock ranges
  udlfb: Correct sub-optimal resolution selection.
  hecubafb: add module_put on error path in hecubafb_probe()
  sm501fb: fix section mismatch warning
  gx1fb: Fix section mismatch warnings
  fbdev: sh_mobile_meram: Correct pointer check for YCbCr chroma plane
parents b2bc4782 3e86f1d8

drivers/video/amba-clcd.c

+2 −0
Original line number Diff line number Diff line
@@ -447,6 +447,8 @@ static int clcdfb_register(struct clcd_fb *fb) 
		goto out;

	}



	fb->fb.device		= &fb->dev->dev;



	fb->fb.fix.mmio_start	= fb->dev->res.start;

	fb->fb.fix.mmio_len	= resource_size(&fb->dev->res);

drivers/video/fsl-diu-fb.c

+0 −16
Original line number Diff line number Diff line
@@ -555,8 +555,6 @@ static void adjust_aoi_size_position(struct fb_var_screeninfo *var, 
static int fsl_diu_check_var(struct fb_var_screeninfo *var,

				struct fb_info *info)

{

	unsigned long htotal, vtotal;



	pr_debug("check_var xres: %d\n", var->xres);

	pr_debug("check_var yres: %d\n", var->yres);
@@ -635,20 +633,6 @@ static int fsl_diu_check_var(struct fb_var_screeninfo *var, 


		break;

	}

	/* If the pixclock is below the minimum spec'd value then set to

	 * refresh rate for 60Hz since this is supported by most monitors.

	 * Refer to Documentation/fb/ for calculations.

	 */

	if ((var->pixclock < MIN_PIX_CLK) || (var->pixclock > MAX_PIX_CLK)) {

		htotal = var->xres + var->right_margin + var->hsync_len +

		    var->left_margin;

		vtotal = var->yres + var->lower_margin + var->vsync_len +

		    var->upper_margin;

		var->pixclock = (vtotal * htotal * 6UL) / 100UL;

		var->pixclock = KHZ2PICOS(var->pixclock);

		pr_debug("pixclock set for 60Hz refresh = %u ps\n",

			var->pixclock);

	}



	var->height = -1;

	var->width = -1;

drivers/video/geode/gx1fb_core.c

+7 −7
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static int crt_option = 1; 
static char panel_option[32] = "";



/* Modes relevant to the GX1 (taken from modedb.c) */

static const struct fb_videomode __initdata gx1_modedb[] = {

static const struct fb_videomode __devinitdata gx1_modedb[] = {

	/* 640x480-60 VESA */

	{ NULL, 60, 640, 480, 39682,  48, 16, 33, 10, 96, 2,

	  0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
@@ -195,7 +195,7 @@ static int gx1fb_blank(int blank_mode, struct fb_info *info) 
	return par->vid_ops->blank_display(info, blank_mode);

}



static int __init gx1fb_map_video_memory(struct fb_info *info, struct pci_dev *dev)

static int __devinit gx1fb_map_video_memory(struct fb_info *info, struct pci_dev *dev)

{

	struct geodefb_par *par = info->par;

	unsigned gx_base;
@@ -268,7 +268,7 @@ static struct fb_ops gx1fb_ops = { 
	.fb_imageblit	= cfb_imageblit,

};



static struct fb_info * __init gx1fb_init_fbinfo(struct device *dev)

static struct fb_info * __devinit gx1fb_init_fbinfo(struct device *dev)

{

	struct geodefb_par *par;

	struct fb_info *info;
@@ -318,7 +318,7 @@ static struct fb_info * __init gx1fb_init_fbinfo(struct device *dev) 
	return info;

}



static int __init gx1fb_probe(struct pci_dev *pdev, const struct pci_device_id *id)

static int __devinit gx1fb_probe(struct pci_dev *pdev, const struct pci_device_id *id)

{

	struct geodefb_par *par;

	struct fb_info *info;
@@ -382,7 +382,7 @@ static int __init gx1fb_probe(struct pci_dev *pdev, const struct pci_device_id * 
	return ret;

}



static void gx1fb_remove(struct pci_dev *pdev)

static void __devexit gx1fb_remove(struct pci_dev *pdev)

{

	struct fb_info *info = pci_get_drvdata(pdev);

	struct geodefb_par *par = info->par;
@@ -441,7 +441,7 @@ static struct pci_driver gx1fb_driver = { 
	.name		= "gx1fb",

	.id_table	= gx1fb_id_table,

	.probe		= gx1fb_probe,

	.remove		= gx1fb_remove,

	.remove		= __devexit_p(gx1fb_remove),

};



static int __init gx1fb_init(void)
@@ -456,7 +456,7 @@ static int __init gx1fb_init(void) 
	return pci_register_driver(&gx1fb_driver);

}



static void __exit gx1fb_cleanup(void)

static void __devexit gx1fb_cleanup(void)

{

	pci_unregister_driver(&gx1fb_driver);

}

drivers/video/hecubafb.c

+2 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static int __devinit hecubafb_probe(struct platform_device *dev) 


	videomemory = vzalloc(videomemorysize);

	if (!videomemory)

		return retval;

		goto err_videomem_alloc;



	info = framebuffer_alloc(sizeof(struct hecubafb_par), &dev->dev);

	if (!info)
@@ -275,6 +275,7 @@ err_fbreg: 
	framebuffer_release(info);

err_fballoc:

	vfree(videomemory);

err_videomem_alloc:

	module_put(board->owner);

	return retval;

}

drivers/video/sh_mobile_meram.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static inline void meram_get_next_icb_addr(struct sh_mobile_meram_info *pdata, 
		icb_offset = 0xc0000000 | (cfg->current_reg << 23);



	*icb_addr_y = icb_offset | (cfg->icb[0].marker_icb << 24);

	if ((*icb_addr_c) && is_nvcolor(cfg->pixelformat))

	if (is_nvcolor(cfg->pixelformat))

		*icb_addr_c = icb_offset | (cfg->icb[1].marker_icb << 24);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE