From 9d439f2fcbe819dd4af476abc52f2c727ce568ff Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Fri, 8 Jul 2011 14:33:02 +0900 Subject: [PATCH] --- yaml --- r: 254771 b: refs/heads/master c: cb26a7b1c18857d14913040b45f3fe51b513f936 h: refs/heads/master i: 254769: 401aed29f8d7a4bf23b6e5322feda0139a17c29c 254767: 5cd633e06cf9508324fa1b7545eb264e233b3cf8 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-s3c24xx/dma.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 473842cb747b..3b09fa1251a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5838e9b8dada491278db48ff9162e25125fa89d6 +refs/heads/master: cb26a7b1c18857d14913040b45f3fe51b513f936 diff --git a/trunk/arch/arm/plat-s3c24xx/dma.c b/trunk/arch/arm/plat-s3c24xx/dma.c index a5b3684e1154..a79a8ccd25f6 100644 --- a/trunk/arch/arm/plat-s3c24xx/dma.c +++ b/trunk/arch/arm/plat-s3c24xx/dma.c @@ -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); @@ -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)