lkml.org 
[lkml]   [2006]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 07/13] maestro3 vfree NULL check fixup
    On 2/24/06, Jesper Juhl <jesper.juhl@gmail.com> wrote:
    > On Friday 24 February 2006 22:09, Zach Brown wrote:
    > > Jesper Juhl wrote:
    > > > vfree() checks for NULL, no need to do it explicitly.
    > >
    > > > static void free_dsp_suspendmem(struct m3_card *card)
    > > > {
    > > > - if(card->suspend_mem)
    > > > - vfree(card->suspend_mem);
    > > > + vfree(card->suspend_mem);
    > > > }
    > >
    > > eh, I'd just get rid of the helper and call vfree() from both sites.
    > >
    > makes perfect sense, I just looked for vfree use - should have checked more
    > in-depth.
    >
    > Here's an updated patch :
    >
    >
    >
    > Don't check pointers for NULL before calling vfree and get rid
    > of pointless helper function in sound/oss/maestro3.c
    >
    >
    > Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
    > ---
    >
    > sound/oss/maestro3.c | 10 ++--------
    > 1 files changed, 2 insertions(+), 8 deletions(-)
    >
    > --- linux-2.6.16-rc4-mm2-orig/sound/oss/maestro3.c 2006-02-24 19:25:49.000000000 +0100
    > +++ linux-2.6.16-rc4-mm2/sound/oss/maestro3.c 2006-02-24 22:12:27.000000000 +0100
    > @@ -2582,15 +2582,9 @@ static int alloc_dsp_suspendmem(struct m
    >
    > return 0;
    > }
    > -static void free_dsp_suspendmem(struct m3_card *card)
    > -{
    > - if(card->suspend_mem)
    > - vfree(card->suspend_mem);
    > -}
    >
    > #else
    > #define alloc_dsp_suspendmem(args...) 0
    > -#define free_dsp_suspendmem(args...)
    > #endif
    >
    > /*
    > @@ -2717,7 +2711,7 @@ out:
    > if(ret) {
    > if(card->iobase)
    > release_region(pci_resource_start(pci_dev, 0), pci_resource_len(pci_dev, 0));
    > - free_dsp_suspendmem(card);
    > + vfree(card);
    > if(card->ac97) {
    > unregister_sound_mixer(card->ac97->dev_mixer);
    > kfree(card->ac97);
    > @@ -2760,7 +2754,7 @@ static void m3_remove(struct pci_dev *pc
    > }
    >
    > release_region(card->iobase, 256);
    > - free_dsp_suspendmem(card);
    > + vfree(card);
    > kfree(card);
    > }
    > devs = NULL;
    >

    Arrgh, I'm an idiot. That patch is wrong.

    Sorry, updated patch in 2 min.

    --
    Jesper Juhl <jesper.juhl@gmail.com>
    Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
    Plain text mails only, please http://www.expita.com/nomime.html
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-02-24 22:21    [W:0.053 / U:0.248 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site