diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2006-12-08 02:40:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 08:29:05 -0800 |
| commit | af342e939d3244624d3e03ece2e6b8e9056dfb72 (patch) | |
| tree | 32e1d2fc78156435f02a6c739fec7a4f4205a5d8 /drivers/video/igafb.c | |
| parent | fd717689f46436fc212882ddc6e02a20be920634 (diff) | |
| download | kernel-crypto-af342e939d3244624d3e03ece2e6b8e9056dfb72.tar.gz kernel-crypto-af342e939d3244624d3e03ece2e6b8e9056dfb72.tar.xz kernel-crypto-af342e939d3244624d3e03ece2e6b8e9056dfb72.zip | |
[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>
Diffstat (limited to 'drivers/video/igafb.c')
| -rw-r--r-- | drivers/video/igafb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/igafb.c b/drivers/video/igafb.c index e6df492c22a..655ae0fa99c 100644 --- a/drivers/video/igafb.c +++ b/drivers/video/igafb.c @@ -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; |