From fef21f39faf87805379908ed762ee15d051e6e93 Mon Sep 17 00:00:00 2001 From: Alexander Beregalov Date: Sat, 26 Mar 2011 20:18:10 +0300 Subject: [PATCH] --- yaml --- r: 249065 b: refs/heads/master c: 24c92eac7e5976b07f663e1149d73075aff96c0d h: refs/heads/master i: 249063: 045cbada649dd93990e7106d24828d16f6cb28e1 v: v3 --- [refs] | 2 +- trunk/drivers/staging/sbe-2t3e3/dc.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 4253972bd64b..21c936fa2ff6 100644 --- 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 index dc53016d546c..9dc4ec2109eb 100644 --- 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; }