Skip to content

Commit

Permalink
usb/atm/ueagle-atm: Don't test for NULL ptr before calling release_fi…
Browse files Browse the repository at this point in the history
…rmware()

release_firmware() deals gracefullt w/ NULL pointers, no need to check
first.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Jesper Juhl authored and Greg Kroah-Hartman committed Apr 18, 2012
1 parent e44fabb commit 7af3959
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions drivers/usb/atm/ueagle-atm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1357,10 +1357,8 @@ static int uea_stat_e1(struct uea_softc *sc)
/* release the dsp firmware as it is not needed until
* the next failure
*/
if (sc->dsp_firm) {
release_firmware(sc->dsp_firm);
sc->dsp_firm = NULL;
}
release_firmware(sc->dsp_firm);
sc->dsp_firm = NULL;
}

/* always update it as atm layer could not be init when we switch to
Expand Down Expand Up @@ -1496,10 +1494,8 @@ static int uea_stat_e4(struct uea_softc *sc)
/* release the dsp firmware as it is not needed until
* the next failure
*/
if (sc->dsp_firm) {
release_firmware(sc->dsp_firm);
sc->dsp_firm = NULL;
}
release_firmware(sc->dsp_firm);
sc->dsp_firm = NULL;
}

/* always update it as atm layer could not be init when we switch to
Expand Down Expand Up @@ -2240,8 +2236,7 @@ static void uea_stop(struct uea_softc *sc)
/* flush the work item, when no one can schedule it */
flush_work_sync(&sc->task);

if (sc->dsp_firm)
release_firmware(sc->dsp_firm);
release_firmware(sc->dsp_firm);
uea_leaves(INS_TO_USBDEV(sc));
}

Expand Down

0 comments on commit 7af3959

Please sign in to comment.