Commit 4d8ce1c9966663bad69e738952179f3cc52710bf

Authored by Julia Lawall
Committed by Takashi Iwai
1 parent 0c23e46eb4

ALSA: sound/pci/ctxfi/ctatc.c: fix error return code

Initialize err before returning on failure, as done elsewhere in the
function.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
(
if@p1 (\(ret < 0\|ret != 0\))
 { ... return ret; }
|
ret@p1 = 0
)
... when != ret = e1
    when != &ret
*if(...)
{
  ... when != ret = e2
      when forall
 return ret;
}

// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 1 changed file with 3 additions and 1 deletions Side-by-side Diff

sound/pci/ctxfi/ctatc.c
... ... @@ -1725,8 +1725,10 @@
1725 1725 atc_connect_resources(atc);
1726 1726  
1727 1727 atc->timer = ct_timer_new(atc);
1728   - if (!atc->timer)
  1728 + if (!atc->timer) {
  1729 + err = -ENOMEM;
1729 1730 goto error1;
  1731 + }
1730 1732  
1731 1733 err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, atc, &ops);
1732 1734 if (err < 0)