summaryrefslogtreecommitdiff
path: root/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c
diff options
context:
space:
mode:
authorMatthew Fredrickson <creslin@digium.com>2007-06-01 15:31:59 +0000
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>2011-02-27 21:09:15 +0200
commit376b0f62c25d158c7a199fc909e66a159b613ff2 (patch)
treeac1800775bdf9db3a4a506c72d43acbee56eea84 /software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c
parentd02af324a13c3e9ab050ba0b8f72a738bd537048 (diff)
Make sure we allocate atomically
git-svn-id: http://svn.asterisk.org/svn/octasic_api/oct612x/trunk@26 537310ab-6354-42db-a3cc-247b777f7be6
Diffstat (limited to 'software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c')
-rw-r--r--software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c
index c0c9d2a..766f93b 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c
@@ -1296,7 +1296,7 @@ UINT32 Oct6100ChannelOpenSer(
tOCT6100_API_ECHO_CHAN_INDEX *ChannelIndexConf;
UINT32 ulResult;
- ChannelIndexConf = kmalloc(sizeof(*ChannelIndexConf), GFP_KERNEL);
+ ChannelIndexConf = kmalloc(sizeof(*ChannelIndexConf), GFP_ATOMIC);
if (!ChannelIndexConf)
return cOCT6100_ERR_FATAL_0;