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

Commit f631a784 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6:
  Fix namespace issue with Hisax
parents 13ffc32e c5b61d59

drivers/isdn/mISDN/layer2.c

+1 −1
Original line number Diff line number Diff line
@@ -2030,7 +2030,7 @@ release_l2(struct layer2 *l2) 
	skb_queue_purge(&l2->down_queue);

	ReleaseWin(l2);

	if (test_bit(FLG_LAPD, &l2->flag)) {

		release_tei(l2);

		TEIrelease(l2);

		if (l2->ch.st)

			l2->ch.st->dev->D.ctrl(&l2->ch.st->dev->D,

			    CLOSE_CHANNEL, NULL);

drivers/isdn/mISDN/layer2.h

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ extern int tei_l2(struct layer2 *, u_int, u_long arg); 


/* from tei.c */

extern int 		l2_tei(struct layer2 *, u_int, u_long arg);

extern void 		release_tei(struct layer2 *);

extern void 		TEIrelease(struct layer2 *);

extern int 		TEIInit(u_int *);

extern void 		TEIFree(void);

drivers/isdn/mISDN/tei.c

+1 −1
Original line number Diff line number Diff line
@@ -945,7 +945,7 @@ l2_tei(struct layer2 *l2, u_int cmd, u_long arg) 
}



void

release_tei(struct layer2 *l2)

TEIrelease(struct layer2 *l2)

{

	struct teimgr	*tm = l2->tm;

	u_long		flags;