diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-22 10:08:40 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-22 10:08:40 -0700 |
| commit | 3eb9992caff10b62cf0ed0bcb1667a58b13188fa (patch) | |
| tree | abe4b4b586978773e2df21898eda611bc6eb822c /drivers/staging/goldfish | |
| parent | e347fa5f4271769bc31fb462631c213aa3824588 (diff) | |
| parent | a798c10faf62a505d24e5f6213fbaf904a39623f (diff) | |
Merge 3.15-rc2 into staging-next
This resolves a bunch of merge errors with other fixes that are already
in Linus's tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/goldfish')
| -rw-r--r-- | drivers/staging/goldfish/goldfish_audio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/goldfish/goldfish_audio.c b/drivers/staging/goldfish/goldfish_audio.c index aca980ec3696..9243845418d6 100644 --- 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); |