diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-05-12 16:10:03 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-05-12 16:10:24 +0100 |
| commit | 25f4a81ef51b7c279786f5b81fe6d89510f46d99 (patch) | |
| tree | c8054ad0b03ce5355477ef2645fa2c9ddd6ed643 /arch/arm/plat-omap/dma.c | |
| parent | 487194a19d2069bfcc9791c3ab2204bed59b136a (diff) | |
| parent | e3318fb40092fecbf5069e7a5daa0040a427d1b4 (diff) | |
| download | blackbird-op-linux-25f4a81ef51b7c279786f5b81fe6d89510f46d99.tar.gz blackbird-op-linux-25f4a81ef51b7c279786f5b81fe6d89510f46d99.zip | |
Merge branch 'omap-fixes' into fixes
Diffstat (limited to 'arch/arm/plat-omap/dma.c')
| -rw-r--r-- | arch/arm/plat-omap/dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 2d86b106ff3e..55a4d3be16b6 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c @@ -747,7 +747,7 @@ int omap_set_dma_callback(int lch, */ dma_addr_t omap_get_dma_src_pos(int lch) { - dma_addr_t offset; + dma_addr_t offset = 0; if (cpu_class_is_omap1()) offset = (dma_addr_t) (OMAP1_DMA_CSSA_L_REG(lch) | @@ -769,7 +769,7 @@ dma_addr_t omap_get_dma_src_pos(int lch) */ dma_addr_t omap_get_dma_dst_pos(int lch) { - dma_addr_t offset; + dma_addr_t offset = 0; if (cpu_class_is_omap1()) offset = (dma_addr_t) (OMAP1_DMA_CDSA_L_REG(lch) | |
