diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 08:05:11 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 08:05:11 -0400 |
commit | 75d8f2931a803b803cb4a850448460475c20f30b (patch) | |
tree | 9853b9084fa55609c8e4abbc1763bc500e05da50 /sound/soc/blackfin | |
parent | ffb690d5aa36d38d7bed7579e3f07b84ff6b3a08 (diff) | |
parent | e93c7d1bc350189511d32cec2f0af79c30e7fa47 (diff) |
Merge branch 'asoc-omap' into for-3.7
Diffstat (limited to 'sound/soc/blackfin')
-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); | |||
413 | 413 | ||
414 | void sport_delete(struct sport_device *sport) | 414 | void sport_delete(struct sport_device *sport) |
415 | { | 415 | { |
416 | if (sport->tx_desc) | ||
417 | dma_free_coherent(NULL, sport->tx_desc_size, | ||
418 | sport->tx_desc, 0); | ||
419 | if (sport->rx_desc) | ||
420 | dma_free_coherent(NULL, sport->rx_desc_size, | ||
421 | sport->rx_desc, 0); | ||
416 | sport_free_resource(sport); | 422 | sport_free_resource(sport); |
423 | kfree(sport); | ||
417 | } | 424 | } |
418 | EXPORT_SYMBOL(sport_delete); | 425 | EXPORT_SYMBOL(sport_delete); |
419 | 426 | ||