From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 26 Apr 2010 07:08:27 +0000 (+0900)
Subject: Merge branch 'sh/stable-updates'
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=e19553427c2e8fdb04fdd98e407164bb59a840ba;p=linux-edison.git

Merge branch 'sh/stable-updates'

Conflicts:
	arch/sh/kernel/dwarf.c
	drivers/dma/shdma.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

e19553427c2e8fdb04fdd98e407164bb59a840ba
diff --cc arch/sh/kernel/dwarf.c
index 8c09f62cebd,a8234b2010d..5ec1d181869
--- a/arch/sh/kernel/dwarf.c
+++ b/arch/sh/kernel/dwarf.c
@@@ -22,7 -22,7 +22,8 @@@
  #include <linux/mm.h>
  #include <linux/elf.h>
  #include <linux/ftrace.h>
 +#include <linux/module.h>
+ #include <linux/slab.h>
  #include <asm/dwarf.h>
  #include <asm/unwinder.h>
  #include <asm/sections.h>
diff --cc drivers/dma/shdma.c
index aab352a63a4,6f25a20de99..323afef7780
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@@ -296,14 -299,18 +298,18 @@@ static int sh_dmae_alloc_chan_resources
  	 * never runs concurrently with itself or free_chan_resources.
  	 */
  	if (param) {
 -		struct sh_dmae_slave_config *cfg;
 +		const struct sh_dmae_slave_config *cfg;
  
 -		cfg = sh_dmae_find_slave(sh_chan, param->slave_id);
 +		cfg = sh_dmae_find_slave(sh_chan, param);
- 		if (!cfg)
- 			return -EINVAL;
+ 		if (!cfg) {
+ 			ret = -EINVAL;
+ 			goto efindslave;
+ 		}
  
- 		if (test_and_set_bit(param->slave_id, sh_dmae_slave_used))
- 			return -EBUSY;
+ 		if (test_and_set_bit(param->slave_id, sh_dmae_slave_used)) {
+ 			ret = -EBUSY;
+ 			goto etestused;
+ 		}
  
  		param->config = cfg;