diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-27 16:10:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-27 16:10:40 +0200 |
| commit | 8f8b77bfdce811acbcf2248219a7aab5f92de938 (patch) | |
| tree | c76c736bdb931d5de55a0de20cd9822d7b48ce8b /sound/soc/blackfin/bf6xx-sport.c | |
| parent | staging: comedi: contec_pci: remove manual legacy attach (diff) | |
| parent | Linux 3.6-rc3 (diff) | |
| download | linux-8f8b77bfdce811acbcf2248219a7aab5f92de938.tar.xz linux-8f8b77bfdce811acbcf2248219a7aab5f92de938.zip | |
Merge 3.6-rc3 into staging-next
This picks up fixes we want in this branch to allow us to properly test.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/soc/blackfin/bf6xx-sport.c')
| -rw-r--r-- | sound/soc/blackfin/bf6xx-sport.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/blackfin/bf6xx-sport.c b/sound/soc/blackfin/bf6xx-sport.c index 318c5ba5360f..dfb744381c42 100644 --- a/sound/soc/blackfin/bf6xx-sport.c +++ b/sound/soc/blackfin/bf6xx-sport.c @@ -413,7 +413,14 @@ EXPORT_SYMBOL(sport_create); void sport_delete(struct sport_device *sport) { + if (sport->tx_desc) + dma_free_coherent(NULL, sport->tx_desc_size, + sport->tx_desc, 0); + if (sport->rx_desc) + dma_free_coherent(NULL, sport->rx_desc_size, + sport->rx_desc, 0); sport_free_resource(sport); + kfree(sport); } EXPORT_SYMBOL(sport_delete); |