[zaptel-commits] mattf: trunk r2303 - in /trunk: ./ wct4xxp/vpm450m.c

[zaptel-commits at lists.digium.com]

Author: mattf
Date: Fri Mar  9 14:05:17 2007
New Revision: 2303

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2303
Log:
Merged revisions 2302 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r2302 | mattf | 2007-03-09 14:04:07 -0600 (Fri, 09 Mar 2007) | 10 lines

Merged revisions 2301 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r2301 | mattf | 2007-03-09 13:59:43 -0600 (Fri, 09 Mar 2007) | 2 lines

Make sure we don't allocate as GFP_KERNEL in atomic context

........

................

Modified:
    trunk/   (props changed)
    trunk/wct4xxp/vpm450m.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/wct4xxp/vpm450m.c
URL: http://svn.digium.com/view/zaptel/trunk/wct4xxp/vpm450m.c?view=diff&rev=2303&r1=2302&r2=2303
==============================================================================
--- trunk/wct4xxp/vpm450m.c (original)
+++ trunk/wct4xxp/vpm450m.c Fri Mar  9 14:05:17 2007
@@ -209,7 +209,7 @@
 
 	if (vpm450m->ecmode[channel] == mode)
 		return;
-	modify = kmalloc(sizeof(tOCT6100_CHANNEL_MODIFY), GFP_KERNEL);
+	modify = kmalloc(sizeof(tOCT6100_CHANNEL_MODIFY), GFP_ATOMIC);
 	if (!modify) {
 		printk("wct4xxp: Unable to allocate memory for setec!\n");
 		return;