---

yaml
---
r: 338040
b: refs/heads/master
c: 823bb2e
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a2bd6b257592cc05e9dd3d36e5810466a075fc3
+refs/heads/master: 823bb2e8e1df99a28977f212975562b30f8dfd5e

trunk/drivers/staging/et131x/et131x.c

@@ -2443,33 +2443,33 @@ static void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
 
 	/* Free Free Buffer Rings */
 	for (id = 0; id < NUM_FBRS; id++) {
-		if (rx_ring->fbr[id]->ring_virtaddr) {
-			/* First the packet memory */
-			for (index = 0; index <
-				(rx_ring->fbr[id]->num_entries / FBR_CHUNKS);
-			     index++) {
-				if (rx_ring->fbr[id]->mem_virtaddrs[index]) {
+		if (!rx_ring->fbr[id]->ring_virtaddr)
+			continue;
 
-					bufsize = (rx_ring->fbr[id]->buffsize * FBR_CHUNKS);
+		/* First the packet memory */
+		for (index = 0;
+		     index < (rx_ring->fbr[id]->num_entries / FBR_CHUNKS);
+		     index++) {
+			if (rx_ring->fbr[id]->mem_virtaddrs[index]) {
+				bufsize = rx_ring->fbr[id]->buffsize * FBR_CHUNKS;
 
-					dma_free_coherent(&adapter->pdev->dev,
-						bufsize,
-						rx_ring->fbr[id]->mem_virtaddrs[index],
-						rx_ring->fbr[id]->mem_physaddrs[index]);
+				dma_free_coherent(&adapter->pdev->dev,
+					bufsize,
+					rx_ring->fbr[id]->mem_virtaddrs[index],
+					rx_ring->fbr[id]->mem_physaddrs[index]);
 
-					rx_ring->fbr[id]->mem_virtaddrs[index] = NULL;
-				}
+				rx_ring->fbr[id]->mem_virtaddrs[index] = NULL;
 			}
+		}
 
-			bufsize =
-			    sizeof(struct fbr_desc) * rx_ring->fbr[id]->num_entries;
+		bufsize =
+		    sizeof(struct fbr_desc) * rx_ring->fbr[id]->num_entries;
 
-			dma_free_coherent(&adapter->pdev->dev, bufsize,
-					    rx_ring->fbr[id]->ring_virtaddr,
-					    rx_ring->fbr[id]->ring_physaddr);
+		dma_free_coherent(&adapter->pdev->dev, bufsize,
+				    rx_ring->fbr[id]->ring_virtaddr,
+				    rx_ring->fbr[id]->ring_physaddr);
 
-			rx_ring->fbr[id]->ring_virtaddr = NULL;
-		}
+		rx_ring->fbr[id]->ring_virtaddr = NULL;
 	}
 
 	/* Free Packet Status Ring */