tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds ec8fa306 3df765fc

+7 -9
+2 -2
drivers/video/aty/atyfb_base.c
··· 435 435 const char *name; 436 436 int i; 437 437 438 - for (i = ARRAY_SIZE(aty_chips); i > 0; i--) 439 - if (par->pci_id == aty_chips[i - 1].pci_id) 438 + for (i = (int)ARRAY_SIZE(aty_chips) - 1; i >= 0; i--) 439 + if (par->pci_id == aty_chips[i].pci_id) 440 440 break; 441 441 442 442 if (i < 0)
+1 -2
drivers/video/nuc900fb.c
··· 587 587 fbinfo->flags = FBINFO_FLAG_DEFAULT; 588 588 fbinfo->pseudo_palette = &fbi->pseudo_pal; 589 589 590 - ret = request_irq(irq, nuc900fb_irqhandler, 0, 591 - pdev->name, fbinfo); 590 + ret = request_irq(irq, nuc900fb_irqhandler, 0, pdev->name, fbi); 592 591 if (ret) { 593 592 dev_err(&pdev->dev, "cannot register irq handler %d -err %d\n", 594 593 irq, ret);
+1 -1
drivers/video/sgivwfb.c
··· 713 713 r = vm_iomap_memory(vma, sgivwfb_mem_phys, sgivwfb_mem_size); 714 714 715 715 printk(KERN_DEBUG "sgivwfb: mmap framebuffer P(%lx)->V(%lx)\n", 716 - offset, vma->vm_start); 716 + sgivwfb_mem_phys + (vma->vm_pgoff << PAGE_SHIFT), vma->vm_start); 717 717 718 718 return r; 719 719 }
+1 -1
drivers/video/sh7760fb.c
··· 567 567 fb_dealloc_cmap(&info->cmap); 568 568 sh7760fb_free_mem(info); 569 569 if (par->irq >= 0) 570 - free_irq(par->irq, par); 570 + free_irq(par->irq, &par->vsync); 571 571 iounmap(par->base); 572 572 release_mem_region(par->ioarea->start, resource_size(par->ioarea)); 573 573 framebuffer_release(info);
-1
drivers/video/vga16fb.c
··· 1265 1265 1266 1266 static void vga16fb_destroy(struct fb_info *info) 1267 1267 { 1268 - struct platform_device *dev = container_of(info->device, struct platform_device, dev); 1269 1268 iounmap(info->screen_base); 1270 1269 fb_dealloc_cmap(&info->cmap); 1271 1270 /* XXX unshare VGA regions */
+2 -2
drivers/video/xilinxfb.c
··· 341 341 342 342 if (drvdata->flags & BUS_ACCESS_FLAG) { 343 343 /* Put a banner in the log (for DEBUG) */ 344 - dev_dbg(dev, "regs: phys=%x, virt=%p\n", drvdata->regs_phys, 345 - drvdata->regs); 344 + dev_dbg(dev, "regs: phys=%pa, virt=%p\n", 345 + &drvdata->regs_phys, drvdata->regs); 346 346 } 347 347 /* Put a banner in the log (for DEBUG) */ 348 348 dev_dbg(dev, "fb: phys=%llx, virt=%p, size=%x\n",