diff options
Diffstat (limited to 'drivers/dahdi/zaphfc/base.c')
| -rw-r--r-- | drivers/dahdi/zaphfc/base.c | 8 |
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 |