---

yaml --- r: 249065 b: refs/heads/master c: 24c92ea h: refs/heads/master i: 249063: 045cbad v: v3
git-mirror · Apr 20, 2011 · fef21f3 · fef21f3
1 parent 39baf52
commit fef21f3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e756910059068f2b247fb8aa6e37e5685b85a0ea
+refs/heads/master: 24c92eac7e5976b07f663e1149d73075aff96c0d
diff --git a/trunk/drivers/staging/sbe-2t3e3/dc.c b/trunk/drivers/staging/sbe-2t3e3/dc.c
@@ -442,15 +442,10 @@ void dc_drop_descriptor_list(struct channel *sc)
 		}
 	}
 
-	if (sc->ether.rx_ring != NULL) {
-		kfree(sc->ether.rx_ring);
-		sc->ether.rx_ring = NULL;
-	}
-
-	if (sc->ether.tx_ring != NULL) {
-		kfree(sc->ether.tx_ring);
-		sc->ether.tx_ring = NULL;
-	}
+	kfree(sc->ether.rx_ring);
+	sc->ether.rx_ring = NULL;
+	kfree(sc->ether.tx_ring);
+	sc->ether.tx_ring = NULL;
 }