[PATCH] 2.6.13-rc4-git3: snd_intel8x0: handle irq_request failure on resume

[PATCH] 2.6.13-rc4-git3: snd_intel8x0: handle irq_request failure on resume

[Rafael J. Wysocki]

Hi,

This patch adds the handling of irq_request() failures during resume to
the snd_intel8x0 driver.

Please consider for applying,
Rafael


Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

--- linux-2.6.13-rc4-git3/sound/pci/intel8x0.c	2005-07-31 12:35:00.000000000 +0200
+++ patched/sound/pci/intel8x0.c	2005-07-31 12:36:10.000000000 +0200
@@ -2390,7 +2390,12 @@ static int intel8x0_resume(snd_card_t *c
 
 	pci_enable_device(chip->pci);
 	pci_set_master(chip->pci);
-	request_irq(chip->irq, snd_intel8x0_interrupt, SA_INTERRUPT|SA_SHIRQ, card->shortname, (void *)chip);
+	if (request_irq(chip->irq, snd_intel8x0_interrupt, SA_INTERRUPT|SA_SHIRQ, card->shortname, (void *)chip)) {
+		snd_printk("unable to grab IRQ %d\n", chip->irq);
+		chip->irq = -1;
+		pci_disable_device(chip->pci);
+		return -EBUSY;
+	}
 	synchronize_irq(chip->irq);
 	snd_intel8x0_chip_init(chip, 1);
 

Re: [PATCH] 2.6.13-rc4-git3: snd_intel8x0: handle irq_request failure on resume

[Takashi Iwai]

Hi Rafael,

At Sun, 31 Jul 2005 12:43:21 +0200,
Rafael J. Wysocki wrote:
> 
> Hi,
> 
> This patch adds the handling of irq_request() failures during resume to
> the snd_intel8x0 driver.
> 
> Please consider for applying,
> Rafael

Not directly with the patch but I have a question about your first
patch.  I found you changed from the second argument of
snd_intel8x0_chip_init() from 0 to 1.  Is it intentional?


Takashi

Re: [PATCH] 2.6.13-rc4-git3: snd_intel8x0: handle irq_request failure on resume

[Rafael J. Wysocki]

On Monday, 1 of August 2005 14:15, Takashi Iwai wrote:
> Hi Rafael,
> 
> At Sun, 31 Jul 2005 12:43:21 +0200,
> Rafael J. Wysocki wrote:
> > 
> > Hi,
> > 
> > This patch adds the handling of irq_request() failures during resume to
> > the snd_intel8x0 driver.
> > 
> > Please consider for applying,
> > Rafael
> 
> Not directly with the patch but I have a question about your first
> patch.  I found you changed from the second argument of
> snd_intel8x0_chip_init() from 0 to 1.  Is it intentional?

Yes.  My box hangs solid while executing snd_intel8x0_chip_init(0)
after requesting the IRQ in _resume().

Greets,
Rafael


-- 
- Would you tell me, please, which way I ought to go from here?
- That depends a good deal on where you want to get to.
		-- Lewis Carroll "Alice's Adventures in Wonderland"