Skip to content

Commit

Permalink
[PATCH] igafb: switch to pci_get API
Browse files Browse the repository at this point in the history
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Alan Cox authored and Linus Torvalds committed Dec 8, 2006
1 parent fd71768 commit af342e9
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/video/igafb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit af342e9

Please sign in to comment.