[zaptel-commits] sruffell: branch 1.4 r4599 - /branches/1.4/kernel/wcte12xp/

[SVN commits to the Zaptel project]

Author: sruffell
Date: Fri Dec 19 11:24:15 2008
New Revision: 4599

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4599
Log:
* Quiet a few new compilation warnings.
* Do not release a spin_lock that we did not acquire.

Modified:
    branches/1.4/kernel/wcte12xp/base.c
    branches/1.4/kernel/wcte12xp/vpmadt032.c

Modified: branches/1.4/kernel/wcte12xp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wcte12xp/base.c?view=diff&rev=4599&r1=4598&r2=4599
==============================================================================
--- branches/1.4/kernel/wcte12xp/base.c (original)
+++ branches/1.4/kernel/wcte12xp/base.c Fri Dec 19 11:24:15 2008
@@ -208,7 +208,7 @@
 
 static inline int t1_setreg_full(struct t1 *wc, int addr, int val, int inisr, int vpm_num)
 {
-	unsigned long flags;
+	unsigned long flags = 0;
 	int hit;
 	int ret;
 
@@ -228,8 +228,8 @@
 		}
 		if (inisr)
 			break;
-	
-		spin_unlock_irqrestore(&wc->reglock, flags);
+		else
+			spin_unlock_irqrestore(&wc->reglock, flags);
 		if (hit < 0) {
 			if ((ret = schluffen(&wc->regq)))
 				return ret;
@@ -306,7 +306,7 @@
 
 static inline int t1_getreg_full(struct t1 *wc, int addr, int inisr, int vpm_num)
 {
-	unsigned long flags;
+	unsigned long flags = 0;
 	int hit;
 	int ret = 0;
 
@@ -361,7 +361,7 @@
 
 static inline int t1_setleds(struct t1 *wc, int leds, int inisr)
 {
-	unsigned long flags;
+	unsigned long flags = 0;
 	int hit;
 	int ret = 0;
 

Modified: branches/1.4/kernel/wcte12xp/vpmadt032.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wcte12xp/vpmadt032.c?view=diff&rev=4599&r1=4598&r2=4599
==============================================================================
--- branches/1.4/kernel/wcte12xp/vpmadt032.c (original)
+++ branches/1.4/kernel/wcte12xp/vpmadt032.c Fri Dec 19 11:24:15 2008
@@ -1054,7 +1054,8 @@
 		struct vpm150m *vpm = wc->vpm150m;
 
 		if (vpm)
-			down_interruptible(&vpm->sem);
+			if (down_interruptible(&vpm->sem))
+				return;
 	}
 }