On Wed, 31 Jan 2007, Alan wrote:
> Signed-off-by: Alan Cox <[email protected]>
>
> diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.20-rc6-mm3/drivers/video/pm3fb.c linux-2.6.20-rc6-mm3/drivers/video/pm3fb.c
> --- linux.vanilla-2.6.20-rc6-mm3/drivers/video/pm3fb.c 2007-01-31 14:20:10.000000000 +0000
> +++ linux-2.6.20-rc6-mm3/drivers/video/pm3fb.c 2007-01-31 14:36:25.000000000 +0000
> @@ -3299,14 +3299,12 @@
> fb_info[i].dev = NULL;
> }
>
> - dev =
> - pci_find_device(PCI_VENDOR_ID_3DLABS,
> + dev = pci_get_device(PCI_VENDOR_ID_3DLABS,
> PCI_DEVICE_ID_3DLABS_PERMEDIA3, dev);
>
> for (i = 0; ((i < PM3_MAX_BOARD) && dev); i++) {
> dev_array[i] = dev;
> - dev =
> - pci_find_device(PCI_VENDOR_ID_3DLABS,
> + dev = pci_get_device(PCI_VENDOR_ID_3DLABS,
> PCI_DEVICE_ID_3DLABS_PERMEDIA3, dev);
> }
>
> @@ -3353,7 +3351,7 @@
> /* now, initialize... or not */
> for (i = 0; i < PM3_MAX_BOARD; i++) {
> l_fb_info = &(fb_info[i]);
> - if ((l_fb_info->dev) && (!disable[i])) { /* PCI device was found and not disabled by user */
> + if (l_fb_info->dev && !disable[i]) { /* PCI device was found and not disabled by user */
> DPRINTK(2,
> "found @%lx Vendor %lx Device %lx ; base @ : %lx - %lx - %lx - %lx - %lx - %lx, irq %ld\n",
> (unsigned long) l_fb_info->dev,
> @@ -3608,7 +3606,7 @@
>
> pm3fb_init();
>
> - return (0);
> + return 0;
> }
>
> void cleanup_module(void)
> @@ -3619,23 +3617,18 @@
> struct pm3fb_info *l_fb_info;
> for (i = 0; i < PM3_MAX_BOARD; i++) {
> l_fb_info = &(fb_info[i]);
> - if ((l_fb_info->dev != NULL)
> - && (!(disable[l_fb_info->board_num]))) {
> - if (l_fb_info->vIOBase !=
> - (unsigned char *) -1) {
> + pci_dev_put(l_fb_info->dev);
> + if (l_fb_info->dev != NULL && !(disable[l_fb_info->board_num])) {
> + if (l_fb_info->vIOBase != (unsigned char *) -1) {
> pm3fb_unmapIO(l_fb_info);
> release_mem_region(l_fb_info->p_fb,
> - l_fb_info->
> - fb_size);
> - release_mem_region(l_fb_info->
> - pIOBase,
> - PM3_REGS_SIZE);
> + l_fb_info->fb_size);
> + release_mem_region(l_fb_info->pIOBase,
> + PM3_REGS_SIZE);
> }
> - unregister_framebuffer(&l_fb_info->gen.
> - info);
> + unregister_framebuffer(&l_fb_info->gen.info);
> }
> }
> }
> - return;
> }
> #endif /* MODULE */
Acked-By: James Simmons <[email protected]>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
