[zaptel-commits] kpfleming: branch 1.4 r4497 - in /branches/1.4/kernel: ./ wctdm24xxp/

[SVN commits to the Zaptel project]

Author: kpfleming
Date: Wed Aug 20 16:30:49 2008
New Revision: 4497

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4497
Log:
resolve some compile warnings

(closes issue #13278)
Reported by: smurfix
Patches:
      zap-string.patch uploaded by smurfix (license 547)


Modified:
    branches/1.4/kernel/wctdm.c
    branches/1.4/kernel/wctdm24xxp/base.c
    branches/1.4/kernel/ztdynamic.c

Modified: branches/1.4/kernel/wctdm.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wctdm.c?view=diff&rev=4497&r1=4496&r2=4497
==============================================================================
--- branches/1.4/kernel/wctdm.c (original)
+++ branches/1.4/kernel/wctdm.c Wed Aug 20 16:30:49 2008
@@ -662,12 +662,12 @@
 			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;
 }
 

Modified: branches/1.4/kernel/wctdm24xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wctdm24xxp/base.c?view=diff&rev=4497&r1=4496&r2=4497
==============================================================================
--- branches/1.4/kernel/wctdm24xxp/base.c (original)
+++ branches/1.4/kernel/wctdm24xxp/base.c Wed Aug 20 16:30:49 2008
@@ -975,11 +975,11 @@
 			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;
 }
 

Modified: branches/1.4/kernel/ztdynamic.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/ztdynamic.c?view=diff&rev=4497&r1=4496&r2=4497
==============================================================================
--- branches/1.4/kernel/ztdynamic.c (original)
+++ branches/1.4/kernel/ztdynamic.c Wed Aug 20 16:30:49 2008
@@ -638,10 +638,16 @@
 	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);
 	}