aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/atm/solos-pci.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/atm/solos-pci.c')
-rw-r--r--drivers/atm/solos-pci.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index e8cd652d2017..98510931c815 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -984,6 +984,7 @@ static uint32_t fpga_tx(struct solos_card *card)
984 } else if (skb && card->using_dma) { 984 } else if (skb && card->using_dma) {
985 SKB_CB(skb)->dma_addr = pci_map_single(card->dev, skb->data, 985 SKB_CB(skb)->dma_addr = pci_map_single(card->dev, skb->data,
986 skb->len, PCI_DMA_TODEVICE); 986 skb->len, PCI_DMA_TODEVICE);
987 card->tx_skb[port] = skb;
987 iowrite32(SKB_CB(skb)->dma_addr, 988 iowrite32(SKB_CB(skb)->dma_addr,
988 card->config_regs + TX_DMA_ADDR(port)); 989 card->config_regs + TX_DMA_ADDR(port));
989 } 990 }
@@ -1152,7 +1153,8 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
1152 db_fpga_upgrade = db_firmware_upgrade = 0; 1153 db_fpga_upgrade = db_firmware_upgrade = 0;
1153 } 1154 }
1154 1155
1155 if (card->fpga_version >= DMA_SUPPORTED){ 1156 if (card->fpga_version >= DMA_SUPPORTED) {
1157 pci_set_master(dev);
1156 card->using_dma = 1; 1158 card->using_dma = 1;
1157 } else { 1159 } else {
1158 card->using_dma = 0; 1160 card->using_dma = 0;