Re: [PATCH] ARM: OMAP: DMA: Fix incorrect channel linking

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



* Jarkko Nikula <jarkko.nikula@xxxxxxxxx> [080317 17:04]:
> Function enable_lnk does incorrect channel link on non-omap1 builds if chain
> is created manually with omap_request_dma and omap_dma_link_lch functions.
> 
> Fix this by making sure that next_linked_ch field is initialized to -1 just
> in omap_request_dma.
> 
> Signed-off-by: Jarkko Nikula <jarkko.nikula@xxxxxxxxx>
> ---
>  arch/arm/plat-omap/dma.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
> index 7937406..c00eda5 100644
> --- a/arch/arm/plat-omap/dma.c
> +++ b/arch/arm/plat-omap/dma.c
> @@ -604,6 +604,7 @@ int omap_request_dma(int dev_id, const char *dev_name,
>  	chan->data = data;
>  #ifndef CONFIG_ARCH_OMAP1
>  	chan->chain_id = -1;
> +	chan->next_linked_ch = -1;
>  #endif
>  	chan->enabled_irqs = OMAP_DMA_DROP_IRQ | OMAP_DMA_BLOCK_IRQ;
>  
> @@ -1087,7 +1088,6 @@ int omap_request_dma_chain(int dev_id, const char *dev_name,
>  			printk(KERN_ERR "omap_dma: Request failed %d\n", err);
>  			return err;
>  		}
> -		dma_chan[channels[i]].next_linked_ch = -1;
>  		dma_chan[channels[i]].prev_linked_ch = -1;
>  		dma_chan[channels[i]].state = DMA_CH_NOTSTARTED;
>  

Pushing today.

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux