Merge 3.15-rc2 into staging-next

[linux-beck.git] / drivers / staging / goldfish / goldfish_audio.c

diff --git a/drivers/staging/goldfish/goldfish_audio.c b/drivers/staging/goldfish/goldfish_audio.c
index aca980ec3696adafdc6238b3070f03b8e991e32b..9243845418d64f61656f14716c5e79fd13ea3bff 100644 (file)
--- a/drivers/staging/goldfish/goldfish_audio.c
+++ b/drivers/staging/goldfish/goldfish_audio.c
@@ -335,6 +335,7 @@ static int goldfish_audio_probe(struct platform_device *pdev)
        return 0;
 
 err_misc_register_failed:
+       free_irq(data->irq, data);
 err_request_irq_failed:
        dma_free_coherent(&pdev->dev, COMBINED_BUFFER_SIZE,
                                        data->buffer_virt, data->buffer_phys);