diff options
| author | Sebastian Siewior <frame+buffer@ml.breakpoint.cc> | 2008-04-28 11:15:39 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 17:58:41 +0200 |
| commit | 2422fbba0684ddf08898ec2f3cf23cb16a54b3f5 (patch) | |
| tree | 97137da905136ce092c288a98f247e8ac2e6271c /drivers/video/metronomefb.c | |
| parent | fbdev: platforming metronomefb and am200epd (diff) | |
| download | linux-2422fbba0684ddf08898ec2f3cf23cb16a54b3f5.tar.xz linux-2422fbba0684ddf08898ec2f3cf23cb16a54b3f5.zip | |
metronomefb: don't free firmware twice in error path
Right now, if request_irq or anthing after it fails than we free the firmware
for the second time what might end bad :)
Signed-off-by: Sebastian Siewior <sebastian@breakpoint.cc>
Acked-by: Jaya Kumar <jayakumar.lkml@gmail.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/metronomefb.c')
| -rw-r--r-- | drivers/video/metronomefb.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/video/metronomefb.c b/drivers/video/metronomefb.c index 17066dd5a190..249791286367 100644 --- a/drivers/video/metronomefb.c +++ b/drivers/video/metronomefb.c @@ -671,14 +671,14 @@ static int __devinit metronomefb_probe(struct platform_device *dev) retval = load_waveform((u8 *) fw_entry->data, fw_entry->size, par->metromem_wfm, 3, 31, &par->frame_count); + release_firmware(fw_entry); if (retval < 0) { printk(KERN_ERR "metronomefb: couldn't process waveform\n"); - goto err_ld_wfm; + goto err_dma_free; } - release_firmware(fw_entry); if (board->setup_irq(info)) - goto err_ld_wfm; + goto err_dma_free; retval = metronome_init_regs(par); if (retval < 0) @@ -719,8 +719,6 @@ err_fb_rel: framebuffer_release(info); err_free_irq: board->free_irq(info); -err_ld_wfm: - release_firmware(fw_entry); err_dma_free: dma_free_writecombine(&dev->dev, par->metromemsize, par->metromem, par->metromem_dma); |