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:
Коммит
589f1e81bd
|
@ -1146,14 +1146,12 @@ static int hisax_cs_setup(int cardnr, struct IsdnCard *card,
|
||||||
}
|
}
|
||||||
if (ret) {
|
if (ret) {
|
||||||
closecard(cardnr);
|
closecard(cardnr);
|
||||||
ret = 0;
|
|
||||||
goto outf_cs;
|
goto outf_cs;
|
||||||
}
|
}
|
||||||
init_tei(cs, cs->protocol);
|
init_tei(cs, cs->protocol);
|
||||||
ret = CallcNewChan(cs);
|
ret = CallcNewChan(cs);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
closecard(cardnr);
|
closecard(cardnr);
|
||||||
ret = 0;
|
|
||||||
goto outf_cs;
|
goto outf_cs;
|
||||||
}
|
}
|
||||||
/* ISAR needs firmware download first */
|
/* ISAR needs firmware download first */
|
||||||
|
@ -1165,7 +1163,7 @@ static int hisax_cs_setup(int cardnr, struct IsdnCard *card,
|
||||||
outf_cs:
|
outf_cs:
|
||||||
kfree(cs);
|
kfree(cs);
|
||||||
card->cs = NULL;
|
card->cs = NULL;
|
||||||
return ret;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockowner)
|
static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockowner)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче