diff mbox

[2/2] ALSA: oxfw: fix detect_loud_models() return value

Message ID 20141212192810.GB22234@mwanda (mailing list archive)
State Accepted
Commit 0d3aba30b755fe9ccaf390f0e71f6fb9fd55bd87
Headers show

Commit Message

Dan Carpenter Dec. 12, 2014, 7:28 p.m. UTC
This code causes a static checker warning:

	sound/firewire/oxfw/oxfw.c:46 detect_loud_models()
	warn: signedness bug returning '(-2)'

The detect_loud_models() function should return false on falure, so that
we don't try to set up the loud code for hardware that doesn't support
it.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Comments

Takashi Sakamoto Dec. 13, 2014, 4:45 a.m. UTC | #1
On Dec 13 2014 04:28, Dan Carpenter wrote:
> This code causes a static checker warning:
> 
> 	sound/firewire/oxfw/oxfw.c:46 detect_loud_models()
> 	warn: signedness bug returning '(-2)'
> 
> The detect_loud_models() function should return false on falure, so that
> we don't try to set up the loud code for hardware that doesn't support
> it.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
> index cf1d0b5..60e5cad 100644
> --- a/sound/firewire/oxfw/oxfw.c
> +++ b/sound/firewire/oxfw/oxfw.c
> @@ -43,7 +43,7 @@ static bool detect_loud_models(struct fw_unit *unit)
>  	err = fw_csr_string(unit->directory, CSR_MODEL,
>  			    model, sizeof(model));
>  	if (err < 0)
> -		return err;
> +		return false;
>  
>  	for (i = 0; i < ARRAY_SIZE(models); i++) {
>  		if (strcmp(models[i], model) == 0)

Reviewd-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>


Thanks

Takashi Sakamoto
o-takashi@sakamocchi.jp
Takashi Iwai Dec. 14, 2014, 3:05 p.m. UTC | #2
At Sat, 13 Dec 2014 13:45:55 +0900,
Takashi Sakamoto wrote:
> 
> On Dec 13 2014 04:28, Dan Carpenter wrote:
> > This code causes a static checker warning:
> > 
> > 	sound/firewire/oxfw/oxfw.c:46 detect_loud_models()
> > 	warn: signedness bug returning '(-2)'
> > 
> > The detect_loud_models() function should return false on falure, so that
> > we don't try to set up the loud code for hardware that doesn't support
> > it.
> > 
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > 
> > diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
> > index cf1d0b5..60e5cad 100644
> > --- a/sound/firewire/oxfw/oxfw.c
> > +++ b/sound/firewire/oxfw/oxfw.c
> > @@ -43,7 +43,7 @@ static bool detect_loud_models(struct fw_unit *unit)
> >  	err = fw_csr_string(unit->directory, CSR_MODEL,
> >  			    model, sizeof(model));
> >  	if (err < 0)
> > -		return err;
> > +		return false;
> >  
> >  	for (i = 0; i < ARRAY_SIZE(models); i++) {
> >  		if (strcmp(models[i], model) == 0)
> 
> Reviewd-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

Applied this one now.  Thanks.

(The second one is still pending, waiting for the final decision for a
 while.)


Takashi
diff mbox

Patch

diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
index cf1d0b5..60e5cad 100644
--- a/sound/firewire/oxfw/oxfw.c
+++ b/sound/firewire/oxfw/oxfw.c
@@ -43,7 +43,7 @@  static bool detect_loud_models(struct fw_unit *unit)
 	err = fw_csr_string(unit->directory, CSR_MODEL,
 			    model, sizeof(model));
 	if (err < 0)
-		return err;
+		return false;
 
 	for (i = 0; i < ARRAY_SIZE(models); i++) {
 		if (strcmp(models[i], model) == 0)