From ff9609b43c45432a9cc1d57ab60a3ef32adef286 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Thu, 12 Jan 2006 16:51:01 -0800 Subject: [PATCH] --- yaml --- r: 18807 b: refs/heads/master c: f5645110aa2ed2dcc3e0373821474506ed4dc512 h: refs/heads/master i: 18805: 1dd936fa970fa2ffed40801ce1b7db0838952755 18803: 5eb5f95f906a096cfd233c19471bc15faeca1658 18799: 16f2d24e9b87f5af2f71c9c98135c8cab6027c8c v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000/e1000_ethtool.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ecce1f30a648..8c0fdb78ddd1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 392137fa9b966cf03f020f9a9a2619099b996266 +refs/heads/master: f5645110aa2ed2dcc3e0373821474506ed4dc512 diff --git a/trunk/drivers/net/e1000/e1000_ethtool.c b/trunk/drivers/net/e1000/e1000_ethtool.c index ceb9cd059b90..ad9ca2ac25fa 100644 --- a/trunk/drivers/net/e1000/e1000_ethtool.c +++ b/trunk/drivers/net/e1000/e1000_ethtool.c @@ -980,11 +980,11 @@ e1000_free_desc_rings(struct e1000_adapter *adapter) } } - if(txdr->desc) { + if (txdr->desc) { pci_free_consistent(pdev, txdr->size, txdr->desc, txdr->dma); txdr->desc = NULL; } - if(rxdr->desc) { + if (rxdr->desc) { pci_free_consistent(pdev, rxdr->size, rxdr->desc, rxdr->dma); rxdr->desc = NULL; } @@ -993,6 +993,7 @@ e1000_free_desc_rings(struct e1000_adapter *adapter) txdr->buffer_info = NULL; kfree(rxdr->buffer_info); rxdr->buffer_info = NULL; + return; }