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

Linus Torvalds · Linus Torvalds · commit 589f1e81bde7 · 2007-07-18T18:38:25.000-07:00
* 'isdn-fix' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  ISDN HiSax: uninitialized return in hisax_cs_setup
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -1146,14 +1146,12 @@ static int hisax_cs_setup(int cardnr, struct IsdnCard *card,`
`1146`	`1146`	`}`
`1147`	`1147`	`if (ret) {`
`1148`	`1148`	`closecard(cardnr);`
`1149`		`- ret = 0;`
`1150`	`1149`	`goto outf_cs;`
`1151`	`1150`	`}`
`1152`	`1151`	`init_tei(cs, cs->protocol);`
`1153`	`1152`	`ret = CallcNewChan(cs);`
`1154`	`1153`	`if (ret) {`
`1155`	`1154`	`closecard(cardnr);`
`1156`		`- ret = 0;`
`1157`	`1155`	`goto outf_cs;`
`1158`	`1156`	`}`
`1159`	`1157`	`/* ISAR needs firmware download first */`
`@@ -1165,7 +1163,7 @@ static int hisax_cs_setup(int cardnr, struct IsdnCard *card,`
`1165`	`1163`	`outf_cs:`
`1166`	`1164`	`kfree(cs);`
`1167`	`1165`	`card->cs = NULL;`
`1168`		`- return ret;`
	`1166`	`+ return 0;`
`1169`	`1167`	`}`
`1170`	`1168`
`1171`	`1169`	`static int checkcard(int cardnr, char id, int busy_flag, struct module *lockowner)`