Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07e0e93d authored by Jesper Juhl's avatar Jesper Juhl Committed by Linus Torvalds
Browse files

[PATCH] maestro3 vfree NULL check fixup 



vfree() checks for NULL, no need to do it explicitly.

Signed-off-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
Acked-by: default avatarZach Brown <zab@zabbo.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 457d3d43

sound/oss/maestro3.c

+2 −8
Original line number Diff line number Diff line
@@ -2582,15 +2582,9 @@ static int alloc_dsp_suspendmem(struct m3_card *card) 


    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 @@ static int __devinit m3_probe(struct pci_dev *pci_dev, const struct pci_device_i 
    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->suspend_mem);

        if(card->ac97) {

            unregister_sound_mixer(card->ac97->dev_mixer);

            kfree(card->ac97);
@@ -2760,7 +2754,7 @@ static void m3_remove(struct pci_dev *pci_dev) 
        }



        release_region(card->iobase, 256);

        free_dsp_suspendmem(card);

        vfree(card->suspend_mem);

        kfree(card);

    }

    devs = NULL;