public inbox for kernel-janitors@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 06/10 v2] ALSA: msnd: check request_region() return value
@ 2010-07-29 10:45 Kulikov Vasiliy
  2010-07-29 12:02 ` Takashi Iwai
  0 siblings, 1 reply; 2+ messages in thread
From: Kulikov Vasiliy @ 2010-07-29 10:45 UTC (permalink / raw)
  To: kernel-janitors; +Cc: Jaroslav Kysela, Takashi Iwai, alsa-devel, linux-kernel

request_region() may fail, if so return -EBUSY.

Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
---
 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..ed42f8e 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
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 06/10 v2] ALSA: msnd: check request_region() return value
  2010-07-29 10:45 [PATCH 06/10 v2] ALSA: msnd: check request_region() return value Kulikov Vasiliy
@ 2010-07-29 12:02 ` Takashi Iwai
  0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2010-07-29 12:02 UTC (permalink / raw)
  To: Kulikov Vasiliy; +Cc: alsa-devel, kernel-janitors, linux-kernel

At Thu, 29 Jul 2010 14:45:24 +0400,
Kulikov Vasiliy wrote:
> 
> request_region() may fail, if so return -EBUSY.
> 
> Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>

Thanks, applied both patches now.


Takashi

> ---
>  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..ed42f8e 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
> -- 
> 1.7.0.4
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-07-29 12:02 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-29 10:45 [PATCH 06/10 v2] ALSA: msnd: check request_region() return value Kulikov Vasiliy
2010-07-29 12:02 ` Takashi Iwai

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox