diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2012-08-05 03:54:05 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-08-09 06:11:11 +0200 |
| commit | 800fb3ddee2c50918d651fbd70515f1e38857305 (patch) | |
| tree | f3d1cbadb92bb9bb04532e45b88e2c90e23c100f /arch/sh | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-800fb3ddee2c50918d651fbd70515f1e38857305.tar.xz linux-800fb3ddee2c50918d651fbd70515f1e38857305.zip | |
sh: dma: fix request_irq usage
When calling request_irq with IRQF_SHARED, the dev cookie must be set
(i.e. non-NULL), otherwise the code rejects it immediately with -EINVAL.
So restore the logic here where we'd pass a pointer to the name as a
dummy unique val.
Otherwise, booting up on my LANDISK system would fail with:
DMAC Address Error0 request_irq fail
This was introduced in commit 7f47c7189b3e8f19a589f77a3ad169d7b691b582.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/drivers/dma/dma-sh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c index 4c171f13b0e8..b22565623142 100644 --- a/arch/sh/drivers/dma/dma-sh.c +++ b/arch/sh/drivers/dma/dma-sh.c @@ -335,7 +335,7 @@ static int dmae_irq_init(void) for (n = 0; n < NR_DMAE; n++) { int i = request_irq(get_dma_error_irq(n), dma_err, - IRQF_SHARED, dmae_name[n], NULL); + IRQF_SHARED, dmae_name[n], (void *)dmae_name[n]); if (unlikely(i < 0)) { printk(KERN_ERR "%s request_irq fail\n", dmae_name[n]); return i; |