diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-05 11:17:04 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-05 11:17:04 +0200 |
| commit | 74bf40f0793fed9e01eb6164c2ce63e8c27ca205 (patch) | |
| tree | f41312c0943978842ac258873b29da04d72d0625 /sound/isa/msnd/msnd_pinnacle.c | |
| parent | e71981343ad29b5d929f82ac56c0b27b8ea0e540 (diff) | |
| parent | c4685849b4d725ab80cd29f5e09f5f128b4724b5 (diff) | |
| download | kernel_samsung_smdk4412-74bf40f0793fed9e01eb6164c2ce63e8c27ca205.zip kernel_samsung_smdk4412-74bf40f0793fed9e01eb6164c2ce63e8c27ca205.tar.gz kernel_samsung_smdk4412-74bf40f0793fed9e01eb6164c2ce63e8c27ca205.tar.bz2 | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/isa/msnd/msnd_pinnacle.c')
| -rw-r--r-- | sound/isa/msnd/msnd_pinnacle.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/isa/msnd/msnd_pinnacle.c b/sound/isa/msnd/msnd_pinnacle.c index 60b6abd..5f3e684 100644 --- a/sound/isa/msnd/msnd_pinnacle.c +++ b/sound/isa/msnd/msnd_pinnacle.c @@ -549,7 +549,10 @@ static int __devinit snd_msnd_attach(struct snd_card *card) printk(KERN_ERR LOGNAME ": Couldn't grab IRQ %d\n", chip->irq); return err; } - request_region(chip->io, DSP_NUMIO, card->shortname); + if (request_region(chip->io, DSP_NUMIO, card->shortname) == NULL) { + free_irq(chip->irq, chip); + return -EBUSY; + } if (!request_mem_region(chip->base, BUFFSIZE, card->shortname)) { printk(KERN_ERR LOGNAME |