aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2006-12-08 05:40:18 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:29:05 -0500
commitaf342e939d3244624d3e03ece2e6b8e9056dfb72 (patch)
tree32e1d2fc78156435f02a6c739fec7a4f4205a5d8
parentfd717689f46436fc212882ddc6e02a20be920634 (diff)
[PATCH] igafb: switch to pci_get API
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>
-rw-r--r--drivers/video/igafb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/igafb.c b/drivers/video/igafb.c
index e6df492c22a5..655ae0fa99ca 100644
--- a/drivers/video/igafb.c
+++ b/drivers/video/igafb.c
@@ -384,19 +384,21 @@ int __init igafb_init(void)
384 if (!con_is_present()) 384 if (!con_is_present())
385 return -ENXIO; 385 return -ENXIO;
386 386
387 pdev = pci_find_device(PCI_VENDOR_ID_INTERG, 387 pdev = pci_get_device(PCI_VENDOR_ID_INTERG,
388 PCI_DEVICE_ID_INTERG_1682, 0); 388 PCI_DEVICE_ID_INTERG_1682, 0);
389 if (pdev == NULL) { 389 if (pdev == NULL) {
390 /* 390 /*
391 * XXX We tried to use cyber2000fb.c for IGS 2000. 391 * XXX We tried to use cyber2000fb.c for IGS 2000.
392 * But it does not initialize the chip in JavaStation-E, alas. 392 * But it does not initialize the chip in JavaStation-E, alas.
393 */ 393 */
394 pdev = pci_find_device(PCI_VENDOR_ID_INTERG, 0x2000, 0); 394 pdev = pci_get_device(PCI_VENDOR_ID_INTERG, 0x2000, 0);
395 if(pdev == NULL) { 395 if(pdev == NULL) {
396 return -ENXIO; 396 return -ENXIO;
397 } 397 }
398 iga2000 = 1; 398 iga2000 = 1;
399 } 399 }
400 /* We leak a reference here but as it cannot be unloaded this is
401 fine. If you write unload code remember to free it in unload */
400 402
401 size = sizeof(struct fb_info) + sizeof(struct iga_par) + sizeof(u32)*16; 403 size = sizeof(struct fb_info) + sizeof(struct iga_par) + sizeof(u32)*16;
402 404