diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
| commit | 74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 (patch) | |
| tree | 7c4cdb103ab1b388c9852a88bd6fb1e73eba0b5c /drivers/ieee1394/pcilynx.c | |
| parent | ee6374c8b0d333c08061c6a97bc77090d7461225 (diff) | |
Merge with Linux 2.4.3.
Note that mingetty does no longer work with serial console, you have to
switch to another getty like getty_ps. This commit also includes a
fix for a setitimer bug which did prevent getty_ps from working on
older kernels.
Diffstat (limited to 'drivers/ieee1394/pcilynx.c')
| -rw-r--r-- | drivers/ieee1394/pcilynx.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c index 27234cbce..3af654f90 100644 --- a/drivers/ieee1394/pcilynx.c +++ b/drivers/ieee1394/pcilynx.c @@ -470,8 +470,6 @@ static int lynx_initialize(struct hpsb_host *host) 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 @@ static void lynx_irq_handler(int irq, void *dev_id, 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 @@ static int add_card(struct pci_dev *dev) 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); } @@ -1457,8 +1458,6 @@ static int add_card(struct pci_dev *dev) /* all allocations successful - simple init stuff follows */ - lynx->lock = SPIN_LOCK_UNLOCKED; - reg_write(lynx, PCI_INT_ENABLE, PCI_INT_DMA_ALL); #ifdef CONFIG_IEEE1394_PCILYNX_PORTS |