Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-09-22 12:42:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'isdn-fix' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6

Browse source 
* '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:
Linus Torvalds 2007-07-18 18:38:25 -07:00
commit 589f1e81bd
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/isdn/hisax/config.c
View file

@ -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)