summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose A. Deniz <odicha@hotmail.com>2009-09-18 01:48:13 +0000
committerTzafrir Cohen <tzafrir@cohens.org.il>2010-01-05 20:46:30 +0200
commit4f6f574a4e4fd45e62f5335c286c1e899895954e (patch)
tree33ed72901ed90847bce631215cf7a3d856be5844
parent02d6741ebd63896a622d8b048638da65a95754ff (diff)
Alias vzaphfc added. Added while(0) missing in 2.6.30 patch Corrected system freeze when configured as dchan instead of hardhdlc D channel
git-svn-id: http://zaphfc.googlecode.com/svn/branches/2.2@5 6b77f504-82de-11de-a8c8-95b3e4aa02d0
-rw-r--r--drivers/dahdi/zaphfc/base.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/dahdi/zaphfc/base.c b/drivers/dahdi/zaphfc/base.c
index cc23e54..c441bd2 100644
--- a/drivers/dahdi/zaphfc/base.c
+++ b/drivers/dahdi/zaphfc/base.c
@@ -71,7 +71,7 @@ int debug_level;
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
-#define SET_PROC_DIRENTRY_OWNER(p) do { (p)->owner = THIS_MODULE; }
+#define SET_PROC_DIRENTRY_OWNER(p) do { (p)->owner = THIS_MODULE; } while(0);
#else
#define SET_PROC_DIRENTRY_OWNER(p) do { } while(0);
#endif
@@ -626,10 +626,7 @@ static int hfc_zap_chanconfig(struct dahdi_chan *d_chan, int sigtype)
struct hfc_card *card = chan->card;
struct dahdi_hfc *hfccard = card->ztdev;
- if ((sigtype == DAHDI_SIG_HARDHDLC) || (hfccard->sigchan == d_chan)) {
- hfccard->sigchan = (sigtype == DAHDI_SIG_HARDHDLC)
- ? d_chan : NULL;
-
+ if ((sigtype == DAHDI_SIG_HARDHDLC) && (hfccard->sigchan == d_chan)) {
hfccard->sigactive = 0;
atomic_set(&hfccard->hdlc_pending, 0);
}
@@ -1680,6 +1677,7 @@ MODULE_DESCRIPTION(hfc_DRIVER_DESCR);
MODULE_AUTHOR("Jens Wilke <jw_vzaphfc@headissue.com>, "
"Daniele (Vihai) Orlandi <daniele@orlandi.com>, "
"Jose A. Deniz <odicha@hotmail.com>");
+MODULE_ALIAS("vzaphfc");
#ifdef MODULE_LICENSE
MODULE_LICENSE("GPL");
#endif