diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 03:38:25 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 03:38:25 +0200 |
| commit | 589f1e81bde732dd0b1bc5d01b6bddd4bcb4527b (patch) | |
| tree | b7dee3b229edc4a5110be4c6b02f6c7bc6d5a165 /drivers | |
| parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
| parent | ISDN HiSax: uninitialized return in hisax_cs_setup (diff) | |
| download | linux-589f1e81bde732dd0b1bc5d01b6bddd4bcb4527b.tar.xz linux-589f1e81bde732dd0b1bc5d01b6bddd4bcb4527b.zip | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/isdn/hisax/config.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c index 5f7907e57090..97097ef3491e 100644 --- a/drivers/isdn/hisax/config.c +++ b/drivers/isdn/hisax/config.c @@ -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) |