* [KJ] [PATCH] check return code for request_region() in gus_wave.c
@ 2006-09-28 10:35 Hashem Masoud
2006-09-28 10:40 ` Hashem Masoud
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Hashem Masoud @ 2006-09-28 10:35 UTC (permalink / raw)
To: kernel-janitors
This is an attempt to handle return code of request_region() in 2 places
in gus_wave.c
Tested by compiling using the option: make dir/ (is this OK?).
Signed-off-by: Hashem Masoud <masoudh@batelco.com.bh>
--- linux/sound/oss/gus_wave.c 2006-09-28 07:23:02.730614592 -0300
+++ linux-2.6.17.13/sound/oss/gus_wave.c 2006-09-27 19:03:42.000000000 -0300
@@ -2938,8 +2938,7 @@ void __init gus_wave_init(struct address
model_num = "3.7";
gus_type = 0x37;
mixer_type = ICS2101;
- if (!request_region(u_MixSelect, 1, "GUS mixer"))
- return;
+ request_region(u_MixSelect, 1, "GUS mixer");
}
else
{
@@ -3030,7 +3029,7 @@ void __init gus_wave_init(struct address
samples = (struct patch_info *)vmalloc((MAX_SAMPLE + 1) * sizeof(*samples));
if (samples = NULL)
{
- printk(KERN_WARNING "gus_init: Cannot allocate memory for instrument tables\n");
+ printk(KERN_WARNING "gus_init: Cant allocate memory for instrument tables\n");
return;
}
conf_printf(tmp, hw_config);
@@ -3085,8 +3084,7 @@ void __init gus_wave_init(struct address
case ICS2101:
gus_mic_vol = gus_line_vol = gus_pcm_volume = 100;
gus_wave_volume = 90;
- if (!request_region(u_MixSelect, 1, "GUS mixer"))
- return;
+ request_region(u_MixSelect, 1, "GUS mixer");
hw_config->slots[5] = ics2101_mixer_init();
audio_devs[gus_devnum]->mixer_dev = hw_config->slots[5]; /* Next mixer# */
return;
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 8+ messages in thread
* [KJ] [PATCH] check return code for request_region() in gus_wave.c
2006-09-28 10:35 [KJ] [PATCH] check return code for request_region() in gus_wave.c Hashem Masoud
@ 2006-09-28 10:40 ` Hashem Masoud
2006-09-28 12:06 ` [KJ] [PATCH] check return code for request_region() Amol Lad
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Hashem Masoud @ 2006-09-28 10:40 UTC (permalink / raw)
To: kernel-janitors
Sorry, ignore the previous message. This is the correct patch.
Signed-off-by: Hashem Masoud <masoudh@batelco.com.bh>
--- linux-2.6.17.13/sound/oss/gus_wave.c 2006-09-27 19:03:42.000000000 -0300
+++ linux/sound/oss/gus_wave.c 2006-09-28 07:23:02.730614592 -0300
@@ -2938,7 +2938,8 @@ void __init gus_wave_init(struct address
model_num = "3.7";
gus_type = 0x37;
mixer_type = ICS2101;
- request_region(u_MixSelect, 1, "GUS mixer");
+ if (!request_region(u_MixSelect, 1, "GUS mixer"))
+ return;
}
else
{
@@ -3029,7 +3030,7 @@ void __init gus_wave_init(struct address
samples = (struct patch_info *)vmalloc((MAX_SAMPLE + 1) * sizeof(*samples));
if (samples = NULL)
{
- printk(KERN_WARNING "gus_init: Cant allocate memory for instrument tables\n");
+ printk(KERN_WARNING "gus_init: Cannot allocate memory for instrument tables\n");
return;
}
conf_printf(tmp, hw_config);
@@ -3084,7 +3085,8 @@ void __init gus_wave_init(struct address
case ICS2101:
gus_mic_vol = gus_line_vol = gus_pcm_volume = 100;
gus_wave_volume = 90;
- request_region(u_MixSelect, 1, "GUS mixer");
+ if (!request_region(u_MixSelect, 1, "GUS mixer"))
+ return;
hw_config->slots[5] = ics2101_mixer_init();
audio_devs[gus_devnum]->mixer_dev = hw_config->slots[5]; /* Next mixer# */
return;
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [KJ] [PATCH] check return code for request_region()
2006-09-28 10:35 [KJ] [PATCH] check return code for request_region() in gus_wave.c Hashem Masoud
2006-09-28 10:40 ` Hashem Masoud
@ 2006-09-28 12:06 ` Amol Lad
2006-09-28 23:44 ` [KJ] [PATCH] check return code for request_region() in gus_wave.c Hashem Masoud
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Amol Lad @ 2006-09-28 12:06 UTC (permalink / raw)
To: kernel-janitors
On Thu, 2006-09-28 at 07:40 -0300, Hashem Masoud wrote:
> Sorry, ignore the previous message. This is the correct patch.
Still not correct ;-).
Please read
1. www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt
2. Documentation/SubmittingPatches
>
> Signed-off-by: Hashem Masoud <masoudh@batelco.com.bh>
>
> --- linux-2.6.17.13/sound/oss/gus_wave.c 2006-09-27 19:03:42.000000000 -0300
> +++ linux/sound/oss/gus_wave.c 2006-09-28 07:23:02.730614592 -0300
> @@ -2938,7 +2938,8 @@ void __init gus_wave_init(struct address
> model_num = "3.7";
> gus_type = 0x37;
> mixer_type = ICS2101;
> - request_region(u_MixSelect, 1, "GUS mixer");
> + if (!request_region(u_MixSelect, 1, "GUS mixer"))
> + return;
You way want to add a printk before returning
> }
> else
> {
> @@ -3029,7 +3030,7 @@ void __init gus_wave_init(struct address
> samples = (struct patch_info *)vmalloc((MAX_SAMPLE + 1) * sizeof(*samples));
> if (samples = NULL)
> {
> - printk(KERN_WARNING "gus_init: Cant allocate memory for instrument tables\n");
> + printk(KERN_WARNING "gus_init: Cannot allocate memory for instrument tables\n");
This change has nothing to do with request_region. One _logical_ change
per patch
> return;
> }
> conf_printf(tmp, hw_config);
> @@ -3084,7 +3085,8 @@ void __init gus_wave_init(struct address
> case ICS2101:
> gus_mic_vol = gus_line_vol = gus_pcm_volume = 100;
> gus_wave_volume = 90;
> - request_region(u_MixSelect, 1, "GUS mixer");
> + if (!request_region(u_MixSelect, 1, "GUS mixer"))
> + return;
> hw_config->slots[5] = ics2101_mixer_init();
> audio_devs[gus_devnum]->mixer_dev = hw_config->slots[5]; /* Next mixer# */
> return;
>
> _______________________________________________
> Kernel-janitors mailing list
> Kernel-janitors@lists.osdl.org
> https://lists.osdl.org/mailman/listinfo/kernel-janitors
>
>
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 8+ messages in thread
* [KJ] [PATCH] check return code for request_region() in gus_wave.c
2006-09-28 10:35 [KJ] [PATCH] check return code for request_region() in gus_wave.c Hashem Masoud
2006-09-28 10:40 ` Hashem Masoud
2006-09-28 12:06 ` [KJ] [PATCH] check return code for request_region() Amol Lad
@ 2006-09-28 23:44 ` Hashem Masoud
2006-09-29 0:08 ` [KJ] [PATCH] check return code for request_region() in Jesper Juhl
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Hashem Masoud @ 2006-09-28 23:44 UTC (permalink / raw)
To: kernel-janitors
Thanks for your directions. The following is the newest attempt (sorry,
without compilation as my time is short!)
Signed-off-by: Hashem Masoud <masoudh@batelco.com.bh>
---
gus_wave.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
---
diff -urp linux-2.6.17.13/sound/oss/gus_wave.c linux/sound/oss/gus_wave.c
--- linux-2.6.17.13/sound/oss/gus_wave.c 2006-09-27 19:03:42.000000000 -0300
+++ linux/sound/oss/gus_wave.c 2006-09-28 20:17:41.093694160 -0300
@@ -2938,7 +2938,10 @@ void __init gus_wave_init(struct address
model_num = "3.7";
gus_type = 0x37;
mixer_type = ICS2101;
- request_region(u_MixSelect, 1, "GUS mixer");
+ if !(request_region(u_MixSelect, 1, "GUS mixer")) {
+ printk(KERN_ERR "request_region failed\n");
+ return;
+ }
}
else
{
@@ -3084,7 +3087,10 @@ void __init gus_wave_init(struct address
case ICS2101:
gus_mic_vol = gus_line_vol = gus_pcm_volume = 100;
gus_wave_volume = 90;
- request_region(u_MixSelect, 1, "GUS mixer");
+ if (!request_region(u_MixSelect, 1, "GUS mixer")) {
+ printk(KERN_ERR "request_region failed\n");
+ return;
+ }
hw_config->slots[5] = ics2101_mixer_init();
audio_devs[gus_devnum]->mixer_dev = hw_config->slots[5]; /* Next mixer# */
return;
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [KJ] [PATCH] check return code for request_region() in
2006-09-28 10:35 [KJ] [PATCH] check return code for request_region() in gus_wave.c Hashem Masoud
` (2 preceding siblings ...)
2006-09-28 23:44 ` [KJ] [PATCH] check return code for request_region() in gus_wave.c Hashem Masoud
@ 2006-09-29 0:08 ` Jesper Juhl
2006-09-29 13:02 ` Hashem Masoud
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Jesper Juhl @ 2006-09-29 0:08 UTC (permalink / raw)
To: kernel-janitors
On 29/09/06, Hashem Masoud <masoudh@batelco.com.bh> wrote:
> Thanks for your directions. The following is the newest attempt (sorry,
> without compilation as my time is short!)
>
If you don't even have time to test compile your changes then you are
in too much of a hurry ...
> Signed-off-by: Hashem Masoud <masoudh@batelco.com.bh>
> ---
> gus_wave.c | 10 ++++++++--
> 1 files changed, 8 insertions(+), 2 deletions(-)
> ---
> diff -urp linux-2.6.17.13/sound/oss/gus_wave.c linux/sound/oss/gus_wave.c
> --- linux-2.6.17.13/sound/oss/gus_wave.c 2006-09-27 19:03:42.000000000 -0300
> +++ linux/sound/oss/gus_wave.c 2006-09-28 20:17:41.093694160 -0300
> @@ -2938,7 +2938,10 @@ void __init gus_wave_init(struct address
> model_num = "3.7";
> gus_type = 0x37;
> mixer_type = ICS2101;
> - request_region(u_MixSelect, 1, "GUS mixer");
> + if !(request_region(u_MixSelect, 1, "GUS mixer")) {
... and it shows ^^^^^
Please take the time to do minimal testing. Not doing so is a waste of
a lot of peoples time.
--
Jesper Juhl <jesper.juhl@gmail.com>
Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please http://www.expita.com/nomime.html
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [KJ] [PATCH] check return code for request_region() in
2006-09-28 10:35 [KJ] [PATCH] check return code for request_region() in gus_wave.c Hashem Masoud
` (3 preceding siblings ...)
2006-09-29 0:08 ` [KJ] [PATCH] check return code for request_region() in Jesper Juhl
@ 2006-09-29 13:02 ` Hashem Masoud
2006-09-29 13:16 ` Jesper Juhl
2006-09-29 18:59 ` Hashem Masoud
6 siblings, 0 replies; 8+ messages in thread
From: Hashem Masoud @ 2006-09-29 13:02 UTC (permalink / raw)
To: kernel-janitors
Jesper Juhl wrote:
>> +++ linux/sound/oss/gus_wave.c 2006-09-28 20:17:41.093694160 -0300
>> @@ -2938,7 +2938,10 @@ void __init gus_wave_init(struct address
>> model_num = "3.7";
>> gus_type = 0x37;
>> mixer_type = ICS2101;
>> - request_region(u_MixSelect, 1, "GUS mixer");
>> + if !(request_region(u_MixSelect, 1, "GUS
>> mixer")) {
>
>
> ... and it shows ^^^^^
BTW, Google web mail access automatically translates tabs into spaces, but if you download your e-mails using POP access this won't happen.
Also, check the patch posted to list, it is intact: http://lists.osdl.org/pipermail/kernel-janitors/2006-September/007352.html
>
> Please take the time to do minimal testing. Not doing so is a waste of
> a lot of peoples time.
>
>
Thanks. I Tested the 2 previous patches through make allmodconfig and make sound/oss/ .
--
Hashem Masoud
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [KJ] [PATCH] check return code for request_region() in
2006-09-28 10:35 [KJ] [PATCH] check return code for request_region() in gus_wave.c Hashem Masoud
` (4 preceding siblings ...)
2006-09-29 13:02 ` Hashem Masoud
@ 2006-09-29 13:16 ` Jesper Juhl
2006-09-29 18:59 ` Hashem Masoud
6 siblings, 0 replies; 8+ messages in thread
From: Jesper Juhl @ 2006-09-29 13:16 UTC (permalink / raw)
To: kernel-janitors
On 29/09/06, Hashem Masoud <masoudh@batelco.com.bh> wrote:
> Jesper Juhl wrote:
>
> >> +++ linux/sound/oss/gus_wave.c 2006-09-28 20:17:41.093694160 -0300
> >> @@ -2938,7 +2938,10 @@ void __init gus_wave_init(struct address
> >> model_num = "3.7";
> >> gus_type = 0x37;
> >> mixer_type = ICS2101;
> >> - request_region(u_MixSelect, 1, "GUS mixer");
> >> + if !(request_region(u_MixSelect, 1, "GUS
> >> mixer")) {
> >
> >
> > ... and it shows ^^^^^
>
> BTW, Google web mail access automatically translates tabs into spaces, but if you download your e-mails using POP access this won't happen.
I'm quite aware of that. That's not what I was talking about, and btw,
you'll notice that any mails I send with patches I do *not* send via
the gmail webinterface...
Now, what I *was* talking about was this bit of your patch: "if
!(request_region"
That should have been "if (!request_region"
> Also, check the patch posted to list, it is intact:
Again, that's not what I was talking about..
--
Jesper Juhl <jesper.juhl@gmail.com>
Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please http://www.expita.com/nomime.html
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [KJ] [PATCH] check return code for request_region() in
2006-09-28 10:35 [KJ] [PATCH] check return code for request_region() in gus_wave.c Hashem Masoud
` (5 preceding siblings ...)
2006-09-29 13:16 ` Jesper Juhl
@ 2006-09-29 18:59 ` Hashem Masoud
6 siblings, 0 replies; 8+ messages in thread
From: Hashem Masoud @ 2006-09-29 18:59 UTC (permalink / raw)
To: kernel-janitors
> Now, what I *was* talking about was this bit of your patch: "if
> !(request_region"
> That should have been "if (!request_region"
This is a corrected patch compile-tested with allmodconfig and make sound/oss/ .
Signed-off-by: Hashem Masoud <masoudh@batelco.com.bh>
---
gus_wave.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
---
diff -urp linux-2.6.17.13/sound/oss/gus_wave.c linux/sound/oss/gus_wave.c
--- linux-2.6.17.13/sound/oss/gus_wave.c 2006-09-27 19:03:42.000000000 -0300
+++ linux/sound/oss/gus_wave.c 2006-09-28 20:17:41.093694160 -0300
@@ -2938,7 +2938,10 @@ void __init gus_wave_init(struct address
model_num = "3.7";
gus_type = 0x37;
mixer_type = ICS2101;
- request_region(u_MixSelect, 1, "GUS mixer");
+ if (!request_region(u_MixSelect, 1, "GUS mixer")) {
+ printk(KERN_ERR "request_region failed\n");
+ return;
+ }
}
else
{
@@ -3084,7 +3087,10 @@ void __init gus_wave_init(struct address
case ICS2101:
gus_mic_vol = gus_line_vol = gus_pcm_volume = 100;
gus_wave_volume = 90;
- request_region(u_MixSelect, 1, "GUS mixer");
+ if (!request_region(u_MixSelect, 1, "GUS mixer")) {
+ printk(KERN_ERR "request_region failed\n");
+ return;
+ }
hw_config->slots[5] = ics2101_mixer_init();
audio_devs[gus_devnum]->mixer_dev = hw_config->slots[5]; /* Next mixer# */
return;
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2006-09-29 18:59 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-09-28 10:35 [KJ] [PATCH] check return code for request_region() in gus_wave.c Hashem Masoud
2006-09-28 10:40 ` Hashem Masoud
2006-09-28 12:06 ` [KJ] [PATCH] check return code for request_region() Amol Lad
2006-09-28 23:44 ` [KJ] [PATCH] check return code for request_region() in gus_wave.c Hashem Masoud
2006-09-29 0:08 ` [KJ] [PATCH] check return code for request_region() in Jesper Juhl
2006-09-29 13:02 ` Hashem Masoud
2006-09-29 13:16 ` Jesper Juhl
2006-09-29 18:59 ` Hashem Masoud
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.