From 89e8090808e6ec0282e8008926e29b203520597b Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Thu, 24 May 2012 04:58:27 +0000
Subject: [PATCH] --- yaml --- r: 309481 b: refs/heads/master c:
 b4bd8ad9bb311e8536f726f7a633620ccd358cde h: refs/heads/master i:   309479:
 d75326b6d2a6a0166e2c4a792365e3bc8f4c92ad v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/atm/solos-pci.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 62a46e7413f0..82eeb6039671 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f935f3f8a567d3d2531886e901ed0db183092abe
+refs/heads/master: b4bd8ad9bb311e8536f726f7a633620ccd358cde
diff --git a/trunk/drivers/atm/solos-pci.c b/trunk/drivers/atm/solos-pci.c
index e8cd652d2017..98510931c815 100644
--- a/trunk/drivers/atm/solos-pci.c
+++ b/trunk/drivers/atm/solos-pci.c
@@ -984,6 +984,7 @@ static uint32_t fpga_tx(struct solos_card *card)
 			} else if (skb && card->using_dma) {
 				SKB_CB(skb)->dma_addr = pci_map_single(card->dev, skb->data,
 								       skb->len, PCI_DMA_TODEVICE);
+				card->tx_skb[port] = skb;
 				iowrite32(SKB_CB(skb)->dma_addr,
 					  card->config_regs + TX_DMA_ADDR(port));
 			}
@@ -1152,7 +1153,8 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
 		db_fpga_upgrade = db_firmware_upgrade = 0;
 	}
 
-	if (card->fpga_version >= DMA_SUPPORTED){
+	if (card->fpga_version >= DMA_SUPPORTED) {
+		pci_set_master(dev);
 		card->using_dma = 1;
 	} else {
 		card->using_dma = 0;