From 0ec90d3c2bfe209548e9cf7935ed6fba2c86830f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 8 Jun 2011 15:48:57 -0400 Subject: [PATCH] --- yaml --- r: 257875 b: refs/heads/master c: e14062563cd5702c656fc9bee14165564341be2b h: refs/heads/master i: 257873: 58068426f4e8dfa08cc548e40458c1b66296a1e5 257871: 40aa8b11903ed91cece67ca326b25c77230db10b v: v3 --- [refs] | 2 +- trunk/arch/blackfin/kernel/debug-mmrs.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1bc1b7e7fe06..42c931f4cc1f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef0531b2e41fd2a0d0ba3ff3cb775947784cc278 +refs/heads/master: e14062563cd5702c656fc9bee14165564341be2b diff --git a/trunk/arch/blackfin/kernel/debug-mmrs.c b/trunk/arch/blackfin/kernel/debug-mmrs.c index 40b3a64f8b60..26ebfe8f63c2 100644 --- a/trunk/arch/blackfin/kernel/debug-mmrs.c +++ b/trunk/arch/blackfin/kernel/debug-mmrs.c @@ -223,7 +223,8 @@ bfin_debug_mmrs_dma(struct dentry *parent, unsigned long base, int num, char mdm __DMA(CURR_DESC_PTR, curr_desc_ptr); __DMA(CURR_ADDR, curr_addr); __DMA(IRQ_STATUS, irq_status); - __DMA(PERIPHERAL_MAP, peripheral_map); + if (strcmp(pfx, "IMDMA") != 0) + __DMA(PERIPHERAL_MAP, peripheral_map); __DMA(CURR_X_COUNT, curr_x_count); __DMA(CURR_Y_COUNT, curr_y_count); }