| Message ID | 1344131645-10813-1-git-send-email-vapier@gentoo.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 800fb3ddee2c50918d651fbd70515f1e38857305 |
| Headers | show |
On Sat, Aug 04, 2012 at 09:54:05PM -0400, Mike Frysinger wrote: > 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> This seems reasonable to me. Paul, do you have any plans to merge this change? I can pull it into my tree if that makes your life easier. > --- > arch/sh/drivers/dma/dma-sh.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c > index 4c171f1..b225656 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; > -- > 1.7.9.7 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-sh" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Aug 27, 2012 at 05:38:06PM +0900, Simon Horman wrote: > On Sat, Aug 04, 2012 at 09:54:05PM -0400, Mike Frysinger wrote: > > 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> > > This seems reasonable to me. > > Paul, do you have any plans to merge this change? > I can pull it into my tree if that makes your life easier. Scratch that, I see that you have already merged this change. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c index 4c171f1..b225656 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;
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> --- arch/sh/drivers/dma/dma-sh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)