Merge branch 'topic/usb-audio' into for-linus

[pandora-kernel.git] / sound / soc / blackfin / bf5xx-sport.c

diff --git a/sound/soc/blackfin/bf5xx-sport.c b/sound/soc/blackfin/bf5xx-sport.c
index b7953c8..469ce7f 100644 (file)
--- a/sound/soc/blackfin/bf5xx-sport.c
+++ b/sound/soc/blackfin/bf5xx-sport.c
@@ -190,7 +190,7 @@ static inline int sport_hook_rx_dummy(struct sport_device *sport)
        desc = get_dma_next_desc_ptr(sport->dma_rx_chan);
        /* Copy the descriptor which will be damaged to backup */
        temp_desc = *desc;
-       desc->x_count = 0xa;
+       desc->x_count = sport->dummy_count / 2;
        desc->y_count = 0;
        desc->next_desc_addr = sport->dummy_rx_desc;
        local_irq_restore(flags);
@@ -309,7 +309,7 @@ static inline int sport_hook_tx_dummy(struct sport_device *sport)
        desc = get_dma_next_desc_ptr(sport->dma_tx_chan);
        /* Store the descriptor which will be damaged */
        temp_desc = *desc;
-       desc->x_count = 0xa;
+       desc->x_count = sport->dummy_count / 2;
        desc->y_count = 0;
        desc->next_desc_addr = sport->dummy_tx_desc;
        local_irq_restore(flags);