forked from luck/tmp_suning_uos_patched
Merge branch 'isdn-fix' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'isdn-fix' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6: ISDN HiSax: uninitialized return in hisax_cs_setup
This commit is contained in:
commit
589f1e81bd
@ -1146,14 +1146,12 @@ static int hisax_cs_setup(int cardnr, struct IsdnCard *card,
|
||||
}
|
||||
if (ret) {
|
||||
closecard(cardnr);
|
||||
ret = 0;
|
||||
goto outf_cs;
|
||||
}
|
||||
init_tei(cs, cs->protocol);
|
||||
ret = CallcNewChan(cs);
|
||||
if (ret) {
|
||||
closecard(cardnr);
|
||||
ret = 0;
|
||||
goto outf_cs;
|
||||
}
|
||||
/* ISAR needs firmware download first */
|
||||
@ -1165,7 +1163,7 @@ static int hisax_cs_setup(int cardnr, struct IsdnCard *card,
|
||||
outf_cs:
|
||||
kfree(cs);
|
||||
card->cs = NULL;
|
||||
return ret;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockowner)
|
||||
|
Loading…
Reference in New Issue
Block a user