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

[zaptel-commits at lists.digium.com]

Author: mattf
Date: Wed Feb 21 10:02:47 2007
New Revision: 2204

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

................
r2201 | mattf | 2007-02-21 09:58:53 -0600 (Wed, 21 Feb 2007) | 10 lines

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

........
r2199 | mattf | 2007-02-21 09:57:20 -0600 (Wed, 21 Feb 2007) | 2 lines

Make sure we do the check for memory allocation failure.

........

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

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=2204&r1=2203&r2=2204
==============================================================================
--- trunk/wct4xxp/vpm450m.c (original)
+++ trunk/wct4xxp/vpm450m.c Wed Feb 21 10:02:47 2007
@@ -210,6 +210,10 @@
 	if (vpm450m->ecmode[channel] == mode)
 		return;
 	modify = kmalloc(sizeof(tOCT6100_CHANNEL_MODIFY), GFP_KERNEL);
+	if (!modify) {
+		printk("wct4xxp: Unable to allocate memory for setec!\n");
+		return;
+	}
 	Oct6100ChannelModifyDef(modify);
 	modify->ulEchoOperationMode = mode;
 	modify->ulChannelHndl = vpm450m->aulEchoChanHndl[channel];
@@ -231,6 +235,10 @@
 	UINT32 ulResult;
 
 	modify = kmalloc(sizeof(tOCT6100_CHANNEL_MODIFY), GFP_KERNEL);
+	if (!modify) {
+		printk("wct4xxp: Unable to allocate memory for setdtmf!\n");
+		return;
+	}
 	Oct6100ChannelModifyDef(modify);
 	modify->ulChannelHndl = vpm450m->aulEchoChanHndl[channel];
 	if (mute) {