Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 589f1e81 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ce524c83 9ee0be05

drivers/isdn/hisax/config.c

+1 −3
Original line number Diff line number Diff line
@@ -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)