summaryrefslogtreecommitdiffstats
path: root/drivers/net/hippi/rrunner.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2013-04-03 12:27:29 +0200
committerThomas Gleixner <tglx@linutronix.de>2013-04-03 12:27:29 +0200
commit0ed2aef9b3bffe598045b62a31a50d912eee92d8 (patch)
treed7dda12955c838f531727d2775d09c4e04bdf066 /drivers/net/hippi/rrunner.c
parentcfea7d7e452f57682a0bb55a55e9f79c569558c2 (diff)
parent8011657b9e63cb2e914b9a0f75233b910c1854cb (diff)
downloadtalos-op-linux-0ed2aef9b3bffe598045b62a31a50d912eee92d8.tar.gz
talos-op-linux-0ed2aef9b3bffe598045b62a31a50d912eee92d8.zip
Merge branch 'fortglx/3.10/time' of git://git.linaro.org/people/jstultz/linux into timers/core
Diffstat (limited to 'drivers/net/hippi/rrunner.c')
-rw-r--r--drivers/net/hippi/rrunner.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c
index e5b19b056909..3c4d6274bb9b 100644
--- a/drivers/net/hippi/rrunner.c
+++ b/drivers/net/hippi/rrunner.c
@@ -202,6 +202,9 @@ static int rr_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
return 0;
out:
+ if (rrpriv->evt_ring)
+ pci_free_consistent(pdev, EVT_RING_SIZE, rrpriv->evt_ring,
+ rrpriv->evt_ring_dma);
if (rrpriv->rx_ring)
pci_free_consistent(pdev, RX_TOTAL_SIZE, rrpriv->rx_ring,
rrpriv->rx_ring_dma);
OpenPOWER on IntegriCloud