---

yaml --- r: 94197 b: refs/heads/master c: 2422fbb h: refs/heads/master i: 94195: 525c4a7 v: v3
git-mirror · Apr 28, 2008 · 8f48872 · 8f48872
1 parent 4f986fa
commit 8f48872
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03c33a4f002b2521debf1efc269cade983b6e86a
+refs/heads/master: 2422fbba0684ddf08898ec2f3cf23cb16a54b3f5
diff --git a/trunk/drivers/video/metronomefb.c b/trunk/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 @@ 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);