diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
| commit | a892acacd3a8546ac161526522f13b5174f2c471 (patch) | |
| tree | ee6d36f27f1388989ebfcabf90253fb7194112ac /drivers/mmc/wbsd.c | |
| parent | 193515d51ccb363165d6b09e9ba5c21089e34bad (diff) | |
| parent | 330d57fb98a916fa8e1363846540dd420e99499a (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/mmc/wbsd.c')
| -rw-r--r-- | drivers/mmc/wbsd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c index 4ff67e7363d9..e954b8354fef 100644 --- a/drivers/mmc/wbsd.c +++ b/drivers/mmc/wbsd.c | |||
| @@ -1602,8 +1602,7 @@ static void __devexit wbsd_release_dma(struct wbsd_host* host) | |||
| 1602 | if (host->dma_addr) | 1602 | if (host->dma_addr) |
| 1603 | dma_unmap_single(host->mmc->dev, host->dma_addr, WBSD_DMA_SIZE, | 1603 | dma_unmap_single(host->mmc->dev, host->dma_addr, WBSD_DMA_SIZE, |
| 1604 | DMA_BIDIRECTIONAL); | 1604 | DMA_BIDIRECTIONAL); |
| 1605 | if (host->dma_buffer) | 1605 | kfree(host->dma_buffer); |
| 1606 | kfree(host->dma_buffer); | ||
| 1607 | if (host->dma >= 0) | 1606 | if (host->dma >= 0) |
| 1608 | free_dma(host->dma); | 1607 | free_dma(host->dma); |
| 1609 | 1608 | ||