[Pkg-voip-commits] r4897 - in /misdn-kernel/trunk/debian/patches: hfcmulti_c90 series

[sjr at alioth.debian.org]

Author: sjr
Date: Thu Nov 29 20:26:28 2007
New Revision: 4897

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4897
Log:
*really* fix HFC-Multi C90 warnings

Added:
    misdn-kernel/trunk/debian/patches/hfcmulti_c90
    misdn-kernel/trunk/debian/patches/series

Added: misdn-kernel/trunk/debian/patches/hfcmulti_c90
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/trunk/debian/patches/hfcmulti_c90?rev=4897&op=file
==============================================================================
--- misdn-kernel/trunk/debian/patches/hfcmulti_c90 (added)
+++ misdn-kernel/trunk/debian/patches/hfcmulti_c90 Thu Nov 29 20:26:28 2007
@@ -1,0 +1,33 @@
+Index: misdn-kernel-1.1.7/drivers/isdn/hardware/mISDN/hfc_multi.c
+===================================================================
+--- misdn-kernel-1.1.7.orig/drivers/isdn/hardware/mISDN/hfc_multi.c	2007-11-09 11:15:52.000000000 +0100
++++ misdn-kernel-1.1.7/drivers/isdn/hardware/mISDN/hfc_multi.c	2007-11-29 21:06:06.000000000 +0100
+@@ -1191,13 +1191,13 @@
+ 				} else
+ 					led |= 1<<i;
+ 			}
+-			unsigned long leddw=led << 24 | led << 16 | led << 8 | led;
++			led = led << 24 | led << 16 | led << 8 | led;
+ 			//HFC_outb(hc, R_BRG_PCM_CFG, 1);
+ 			//HFC_outb(c, R_BRG_PCM_CFG, (0x0 << 6) | 0x3); /*was _io before*/
+ #ifndef CONFIG_HFCMULTI_PCIMEM
+ 			HFC_outb(hc, R_BRG_PCM_CFG, 1 | V_PCM_CLK);
+ 			outw(0x4000, hc->pci_iobase + 4);
+-			outl(leddw, hc->pci_iobase);
++			outl(led, hc->pci_iobase);
+ 			HFC_outb(hc, R_BRG_PCM_CFG, V_PCM_CLK);
+ #endif 
+ 		}
+@@ -3630,10 +3630,9 @@
+ 		printk(KERN_WARNING "%s: remove instance from list\n", __FUNCTION__);
+ 
+ #if 1
+-	u_long flags2;
+-	spin_lock_irqsave(&HFCM_obj.lock,flags2);
++	spin_lock_irqsave(&HFCM_obj.lock,flags);
+ 	list_del(&hc->list);
+-	spin_unlock_irqrestore(&HFCM_obj.lock,flags2);
++	spin_unlock_irqrestore(&HFCM_obj.lock,flags);
+ #endif
+ 
+ 	if (debug & DEBUG_HFCMULTI_INIT)

Added: misdn-kernel/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/trunk/debian/patches/series?rev=4897&op=file
==============================================================================
--- misdn-kernel/trunk/debian/patches/series (added)
+++ misdn-kernel/trunk/debian/patches/series Thu Nov 29 20:26:28 2007
@@ -1,0 +1,1 @@
+hfcmulti_c90