diff options
author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2010-08-09 08:08:10 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2010-09-22 17:53:45 -0400 |
commit | 0246e77b4d374bb37aa08c3fcadad20012e85ea0 (patch) | |
tree | 62b59fda3aca474abdec3c2385dc3fd00278ef34 /drivers/dma/ste_dma40_ll.h | |
parent | b55912c66a317d9aaf4749488ca43d510c8a8a87 (diff) |
DMAENGINE: ste_dma40: fix bug related to callback handling
The callback got called even when it was not supposed to. Also
removed some not needed interrupt trigger on/off code.
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma/ste_dma40_ll.h')
-rw-r--r-- | drivers/dma/ste_dma40_ll.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/dma/ste_dma40_ll.h b/drivers/dma/ste_dma40_ll.h index 9c0fa2f5fe57..0c468c310c18 100644 --- a/drivers/dma/ste_dma40_ll.h +++ b/drivers/dma/ste_dma40_ll.h | |||
@@ -302,8 +302,7 @@ int d40_phy_sg_to_lli(struct scatterlist *sg, | |||
302 | dma_addr_t lli_phys, | 302 | dma_addr_t lli_phys, |
303 | u32 reg_cfg, | 303 | u32 reg_cfg, |
304 | u32 data_width, | 304 | u32 data_width, |
305 | int psize, | 305 | int psize); |
306 | bool term_int); | ||
307 | 306 | ||
308 | int d40_phy_fill_lli(struct d40_phy_lli *lli, | 307 | int d40_phy_fill_lli(struct d40_phy_lli *lli, |
309 | dma_addr_t data, | 308 | dma_addr_t data, |
@@ -336,7 +335,7 @@ int d40_log_sg_to_dev(struct d40_lcla_elem *lcla, | |||
336 | u32 src_data_width, | 335 | u32 src_data_width, |
337 | u32 dst_data_width, | 336 | u32 dst_data_width, |
338 | enum dma_data_direction direction, | 337 | enum dma_data_direction direction, |
339 | bool term_int, dma_addr_t dev_addr, int max_len, | 338 | dma_addr_t dev_addr, int max_len, |
340 | int llis_per_log); | 339 | int llis_per_log); |
341 | 340 | ||
342 | int d40_log_lli_write(struct d40_log_lli_full *lcpa, | 341 | int d40_log_lli_write(struct d40_log_lli_full *lcpa, |
@@ -352,6 +351,6 @@ int d40_log_sg_to_lli(int lcla_id, | |||
352 | struct d40_log_lli *lli_sg, | 351 | struct d40_log_lli *lli_sg, |
353 | u32 lcsp13, /* src or dst*/ | 352 | u32 lcsp13, /* src or dst*/ |
354 | u32 data_width, | 353 | u32 data_width, |
355 | bool term_int, int max_len, int llis_per_log); | 354 | int max_len, int llis_per_log); |
356 | 355 | ||
357 | #endif /* STE_DMA40_LLI_H */ | 356 | #endif /* STE_DMA40_LLI_H */ |