patch-2.4.3 linux/drivers/ieee1394/pcilynx.c

• Lines: 39
• Date: Tue Mar 20 15:42:18 2001
• Orig file: v2.4.2/linux/drivers/ieee1394/pcilynx.c
• Orig date: Wed Feb 21 18:20:22 2001

diff -u --recursive --new-file v2.4.2/linux/drivers/ieee1394/pcilynx.c linux/drivers/ieee1394/pcilynx.c
@@ -470,8 +470,6 @@
         lynx->phy_reg0 = -1;
 
         lynx->async.queue = NULL;
-        spin_lock_init(&lynx->async.queue_lock);
-        spin_lock_init(&lynx->phy_reg_lock);
         
         pcl.next = pcl_bus(lynx, lynx->rcv_pcl);
         put_pcl(lynx, lynx->rcv_pcl_start, &pcl);
@@ -1127,7 +1125,7 @@
 
         if (intmask & PCI_INT_1394) {
                 if (linkint & LINK_INT_PHY_TIMEOUT) {
-                        PRINT(KERN_INFO, lynx->id, "PHY timeout occured");
+                        PRINT(KERN_INFO, lynx->id, "PHY timeout occurred");
                 }
                 if (linkint & LINK_INT_PHY_BUSRESET) {
                         PRINT(KERN_INFO, lynx->id, "bus reset interrupt");
@@ -1357,7 +1355,10 @@
         lynx->id = num_of_cards-1;
         lynx->dev = dev;
 
-        if (!pci_dma_supported(dev, 0xffffffff)) {
+	lynx->lock = SPIN_LOCK_UNLOCKED;
+	lynx->phy_reg_lock = SPIN_LOCK_UNLOCKED;
+
+        if (pci_set_dma_mask(dev, 0xffffffff)) {
                 FAIL("DMA address limits not supported for PCILynx hardware %d",
                      lynx->id);
         }
@@ -1456,8 +1457,6 @@
         lynx->iso_rcv.pcl_start = alloc_pcl(lynx);
 
         /* all allocations successful - simple init stuff follows */
-
-        lynx->lock = SPIN_LOCK_UNLOCKED;
 
         reg_write(lynx, PCI_INT_ENABLE, PCI_INT_DMA_ALL);