Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 254771
b: refs/heads/master
c: cb26a7b
h: refs/heads/master
i:
  254769: 401aed2
  254767: 5cd633e
v: v3
  • Loading branch information
Wolfram Sang authored and Kukjin Kim committed Jul 8, 2011
1 parent 4779cb7 commit 9d439f2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5838e9b8dada491278db48ff9162e25125fa89d6
refs/heads/master: cb26a7b1c18857d14913040b45f3fe51b513f936
4 changes: 1 addition & 3 deletions trunk/arch/arm/plat-s3c24xx/dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1231,7 +1231,7 @@ static void s3c2410_dma_resume_chan(struct s3c2410_dma_chan *cp)
/* restore channel's hardware configuration */

if (!cp->in_use)
return 0;
return;

printk(KERN_INFO "dma%d: restoring configuration\n", cp->number);

Expand All @@ -1242,8 +1242,6 @@ static void s3c2410_dma_resume_chan(struct s3c2410_dma_chan *cp)

if (cp->map != NULL)
dma_sel.select(cp, cp->map);

return 0;
}

static void s3c2410_dma_resume(void)
Expand Down

0 comments on commit 9d439f2

Please sign in to comment.