lkml.org 
[lkml]   [2012]   [Apr]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 25/26] usb/atm/ueagle-atm: Don't test for NULL ptr before calling release_firmware()
    release_firmware() deals gracefullt w/ NULL pointers, no need to check
    first.

    Signed-off-by: Jesper Juhl <jj@chaosbits.net>
    ---
    drivers/usb/atm/ueagle-atm.c | 15 +++++----------
    1 file changed, 5 insertions(+), 10 deletions(-)

    diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
    index 01ea5d7..d7e422d 100644
    --- a/drivers/usb/atm/ueagle-atm.c
    +++ b/drivers/usb/atm/ueagle-atm.c
    @@ -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
    @@ -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
    @@ -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));
    }

    --
    1.7.10

    --
    Jesper Juhl <jj@chaosbits.net> http://www.chaosbits.net/
    Don't top-post http://www.catb.org/jargon/html/T/top-post.html
    Plain text mails only, please.



    \
     
     \ /
      Last update: 2012-04-09 23:07    [W:0.022 / U:0.696 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site