From 376b0f62c25d158c7a199fc909e66a159b613ff2 Mon Sep 17 00:00:00 2001 From: Matthew Fredrickson Date: Fri, 1 Jun 2007 15:31:59 +0000 Subject: Make sure we allocate atomically git-svn-id: http://svn.asterisk.org/svn/octasic_api/oct612x/trunk@26 537310ab-6354-42db-a3cc-247b777f7be6 --- software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c | 2 +- software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c | 2 +- 2 files changed, 2 insertions(+), 2 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; diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c index 36a07c4..ae2fe73 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c @@ -312,7 +312,7 @@ UINT32 Oct6100ChipOpen( if ( ulResult != cOCT6100_ERR_OK ) return ulResult; - InstanceSizes = kmalloc(sizeof(tOCT6100_API_INSTANCE_SIZES), GFP_KERNEL); + InstanceSizes = kmalloc(sizeof(tOCT6100_API_INSTANCE_SIZES), GFP_ATOMIC); if (!InstanceSizes) return cOCT6100_ERR_FATAL_0; /* Calculate the amount of memory needed for the API instance structure. */ -- cgit v1.2.3