Commit af342e93 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

[PATCH] igafb: switch to pci_get API 



Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fd717689

drivers/video/igafb.c

+4 −2
Original line number Diff line number Diff line
@@ -384,19 +384,21 @@ int __init igafb_init(void) 
        if (!con_is_present())

                return -ENXIO;



        pdev = pci_find_device(PCI_VENDOR_ID_INTERG, 

        pdev = pci_get_device(PCI_VENDOR_ID_INTERG,

                               PCI_DEVICE_ID_INTERG_1682, 0);

	if (pdev == NULL) {

		/*

		 * XXX We tried to use cyber2000fb.c for IGS 2000.

		 * But it does not initialize the chip in JavaStation-E, alas.

		 */

        	pdev = pci_find_device(PCI_VENDOR_ID_INTERG, 0x2000, 0);

        	pdev = pci_get_device(PCI_VENDOR_ID_INTERG, 0x2000, 0);

        	if(pdev == NULL) {

        	        return -ENXIO;

		}

		iga2000 = 1;

	}

	/* We leak a reference here but as it cannot be unloaded this is

	   fine. If you write unload code remember to free it in unload */

	

	size = sizeof(struct fb_info) + sizeof(struct iga_par) + sizeof(u32)*16;