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

Commit 2422fbba authored by Sebastian Siewior's avatar Sebastian Siewior Committed by Linus Torvalds
Browse files

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: default avatarSebastian Siewior <sebastian@breakpoint.cc>
Acked-by: default avatarJaya Kumar <jayakumar.lkml@gmail.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 03c33a4f

drivers/video/metronomefb.c

+3 −5
Original line number Diff line number Diff line
@@ -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 @@ static int __devinit metronomefb_probe(struct platform_device *dev) 
	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);