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; }