patch-2.4.0-test2 linux/drivers/sound/skeleton.c
Next file: linux/drivers/sound/sonicvibes.c
Previous file: linux/drivers/sound/sb_card.c
Back to the patch index
Back to the overall index
- Lines: 22
- Date:
Mon Jun 19 13:42:41 2000
- Orig file:
v2.4.0-test1/linux/drivers/sound/skeleton.c
- Orig date:
Thu Jan 14 22:59:47 1999
diff -u --recursive --new-file v2.4.0-test1/linux/drivers/sound/skeleton.c linux/drivers/sound/skeleton.c
@@ -78,9 +78,9 @@
* For the example we will only initialise the MSS
*/
- iobase = pcidev->base_address[0] & PCI_BASE_ADDRESS_IO_MASK;
- mssbase = pcidev->base_address[1] & PCI_BASE_ADDRESS_IO_MASK;
- mpubase = pcidev->base_address[2] & PCI_BASE_ADDRESS_IO_MASK;
+ iobase = pci_resource_start(pcidev, 0);
+ mssbase = pci_resource_start(pcidev, 1);
+ mpubase = pci_resource_start(pcidev, 2);
/*
* Reset the board
@@ -160,6 +160,8 @@
while((pcidev = pci_find_device(PCI_VENDOR_MYIDENT, PCI_DEVICE_ID_MYIDENT_MYCARD1, pcidev))!=NULL)
{
+ if (pci_enable_device(pcidev))
+ continue;
count+=mycard_install(pcidev);
if(count)
return 0;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)