summaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2014-04-08 09:15:22 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-04-16 11:41:44 -0700
commitff8ebe6448e98df59a8c7e7e93876f8f3d6a8b19 (patch)
tree46fb35b16877afd5c1d2fe1a7219c21b97a4b545 /drivers/staging
parent5ed0a8e667090003fdf7b750296fcfb248349502 (diff)
downloadblackbird-op-linux-ff8ebe6448e98df59a8c7e7e93876f8f3d6a8b19.tar.gz
blackbird-op-linux-ff8ebe6448e98df59a8c7e7e93876f8f3d6a8b19.zip
staging: goldfish: Call free_irq in error path
If misc_register failed in goldfish_audio_probe, the already requested IRQ wouldn't get freed. Add a call to free_irq() like there is in goldfish_audio_remove(). Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> Acked-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/goldfish/goldfish_audio.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/goldfish/goldfish_audio.c b/drivers/staging/goldfish/goldfish_audio.c
index f96dcec740ae..7ac2602242f1 100644
--- a/drivers/staging/goldfish/goldfish_audio.c
+++ b/drivers/staging/goldfish/goldfish_audio.c
@@ -334,6 +334,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);
OpenPOWER on IntegriCloud