diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-08-20 21:30:49 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-08-20 21:30:49 +0000 |
| commit | 8474e4a1b7eca34eb5f579c70fc09269aec686a9 (patch) | |
| tree | 99c9ed50cc5bd21fc7d657bd8345c55a93bfb713 | |
| parent | 252bd2c93858654d6af5ebca0ed6704f1c14401a (diff) | |
resolve some compile warnings
(closes issue #13278)
Reported by: smurfix
Patches:
zap-string.patch uploaded by smurfix (license 547)
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4497 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -rw-r--r-- | kernel/wctdm.c | 6 | ||||
| -rw-r--r-- | kernel/wctdm24xxp/base.c | 6 | ||||
| -rw-r--r-- | kernel/ztdynamic.c | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/kernel/wctdm.c b/kernel/wctdm.c index 2cb657a..8d47c61 100644 --- a/kernel/wctdm.c +++ b/kernel/wctdm.c @@ -662,12 +662,12 @@ static int wctdm_proslic_getreg_indirect(struct wctdm *wc, int card, unsigned ch data2 = __wctdm_getreg(wc, card, IDA_HI); res = data1 | (data2 << 8); } else - p = "Failed to wait inside\n"; + p = "Failed to wait inside"; } else - p = "failed to wait\n"; + p = "failed to wait"; spin_unlock_irqrestore(&wc->lock, flags); if (p) - printk(p); + printk("%s\n",p); return res; } diff --git a/kernel/wctdm24xxp/base.c b/kernel/wctdm24xxp/base.c index aff2dcc..2ccdc3e 100644 --- a/kernel/wctdm24xxp/base.c +++ b/kernel/wctdm24xxp/base.c @@ -975,11 +975,11 @@ static int wctdm_proslic_getreg_indirect(struct wctdm *wc, int card, unsigned ch data2 = wctdm_getreg(wc, card, IDA_HI); res = data1 | (data2 << 8); } else - p = "Failed to wait inside\n"; + p = "Failed to wait inside"; } else - p = "failed to wait\n"; + p = "failed to wait"; if (p) - printk(p); + printk("%s\n",p); return res; } diff --git a/kernel/ztdynamic.c b/kernel/ztdynamic.c index 70f2246..4db7e1e 100644 --- a/kernel/ztdynamic.c +++ b/kernel/ztdynamic.c @@ -638,10 +638,16 @@ static int create_dynamic(ZT_DYNAMIC_SPAN *zds) ztd = find_driver(zds->driver); if (!ztd) { /* Try loading the right module */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,70) char fn[80]; +#endif spin_unlock_irqrestore(&dlock, flags); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70) + request_module("ztd-%s", zds->driver); +#else sprintf(fn, "ztd-%s", zds->driver); request_module(fn); +#endif spin_lock_irqsave(&dlock, flags); ztd = find_driver(zds->driver); } |