[CVS] km km.c,1.103,1.104
Status: Beta
Brought to you by:
volodya
From: <gat...@li...> - 2005-03-12 13:55:10
|
Update of /cvsroot/gatos/km In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25219 Modified Files: km.c Log Message: pci_enable_device must be called before getting irq, otherwise km may end up using wrong irq! Index: km.c =================================================================== RCS file: /cvsroot/gatos/km/km.c,v retrieving revision 1.103 retrieving revision 1.104 diff -u -d -r1.103 -r1.104 --- km.c 9 Mar 2005 08:40:32 -0000 1.103 +++ km.c 12 Mar 2005 13:55:00 -0000 1.104 @@ -611,6 +611,8 @@ kms=&(km_devices[num_devices]); memset(kms, 0, sizeof(KM_STRUCT)); + if (pci_enable_device(dev)) + return -EIO; kms->dev=dev; kms->irq=dev->irq; kms->gui_dma_queue.request=kms->gui_dma_request; @@ -631,8 +633,6 @@ kms->vbi.info_du=-1; spin_lock_init(&(kms->kms_lock)); printk(KERN_DEBUG "km: using irq %ld\n", kms->irq); - if (pci_enable_device(dev)) - return -EIO; printk(KERN_DEBUG "Register aperture is 0x%08lx 0x%08lx\n", pci_resource_start(dev, 2), pci_resource_len(dev, 2)); /* if (!request_mem_region(pci_resource_start(dev,2), |