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

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

Merge tag 'fbdev-fixes-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux 

Pull fbdev fixes from Tomi Valkeinen:
 "Small fbdev fixes:
   - compile fixes
   - atyfb initialization fix
   - Fix freeing of the irq in sh7760fb & nuc900fb"

* tag 'fbdev-fixes-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  video: sh7760fb: fix to pass correct device identity to free_irq()
  fbdev/atyfb: fix recent breakage in correct_chipset()
  fbdev/sgivwfb: fix compilation error in sgivwfb_mmap()
  video: nuc900fb: fix to pass correct device identity to request_irq()
  vga16fb: Remove unused variable
  video: xilinxfb: Fix compilation warning
parents 3df765fc 7808e329

drivers/video/aty/atyfb_base.c

+2 −2
Original line number Diff line number Diff line
@@ -435,8 +435,8 @@ static int correct_chipset(struct atyfb_par *par) 
	const char *name;

	int i;



	for (i = ARRAY_SIZE(aty_chips); i > 0; i--)

		if (par->pci_id == aty_chips[i - 1].pci_id)

	for (i = (int)ARRAY_SIZE(aty_chips) - 1; i >= 0; i--)

		if (par->pci_id == aty_chips[i].pci_id)

			break;



	if (i < 0)

drivers/video/nuc900fb.c

+1 −2
Original line number Diff line number Diff line
@@ -587,8 +587,7 @@ static int nuc900fb_probe(struct platform_device *pdev) 
	fbinfo->flags			= FBINFO_FLAG_DEFAULT;

	fbinfo->pseudo_palette		= &fbi->pseudo_pal;



	ret = request_irq(irq, nuc900fb_irqhandler, 0,

			  pdev->name, fbinfo);

	ret = request_irq(irq, nuc900fb_irqhandler, 0, pdev->name, fbi);

	if (ret) {

		dev_err(&pdev->dev, "cannot register irq handler %d -err %d\n",

			irq, ret);

drivers/video/sgivwfb.c

+1 −1
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ static int sgivwfb_mmap(struct fb_info *info, 
	r = vm_iomap_memory(vma, sgivwfb_mem_phys, sgivwfb_mem_size);



	printk(KERN_DEBUG "sgivwfb: mmap framebuffer P(%lx)->V(%lx)\n",

	       offset, vma->vm_start);

		sgivwfb_mem_phys + (vma->vm_pgoff << PAGE_SHIFT), vma->vm_start);



	return r;

}

drivers/video/sh7760fb.c

+1 −1
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ static int sh7760fb_remove(struct platform_device *dev) 
	fb_dealloc_cmap(&info->cmap);

	sh7760fb_free_mem(info);

	if (par->irq >= 0)

		free_irq(par->irq, par);

		free_irq(par->irq, &par->vsync);

	iounmap(par->base);

	release_mem_region(par->ioarea->start, resource_size(par->ioarea));

	framebuffer_release(info);

drivers/video/vga16fb.c

+0 −1
Original line number Diff line number Diff line
@@ -1265,7 +1265,6 @@ static void vga16fb_imageblit(struct fb_info *info, const struct fb_image *image 


static void vga16fb_destroy(struct fb_info *info)

{

	struct platform_device *dev = container_of(info->device, struct platform_device, dev);

	iounmap(info->screen_base);

	fb_dealloc_cmap(&info->cmap);

	/* XXX unshare VGA regions */