From 4de38d677104b882a4509025992acfbd76bcbe80 Mon Sep 17 00:00:00 2001 From: ddl Date: Thu, 2 Sep 2010 10:50:15 +0800 Subject: [PATCH] sound:fix kmalloc called with GFP_KERNEL flag is error in atomic context --- sound/soc/rk2818/rk2818_pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 sound/soc/rk2818/rk2818_pcm.c diff --git a/sound/soc/rk2818/rk2818_pcm.c b/sound/soc/rk2818/rk2818_pcm.c old mode 100755 new mode 100644 index bedaf6f00a38..b5b9afdaee66 --- a/sound/soc/rk2818/rk2818_pcm.c +++ b/sound/soc/rk2818/rk2818_pcm.c @@ -96,7 +96,7 @@ static int rockchip_dma_buffer_set_enqueue(struct rockchip_runtime_data *prtd, d struct rockchip_dma_buf_set *sg_buf; DBG("Enter::%s----%d\n",__FUNCTION__,__LINE__); - sg_buf = kzalloc(sizeof(struct rockchip_dma_buf_set), GFP_KERNEL); + sg_buf = kzalloc(sizeof(struct rockchip_dma_buf_set), GFP_ATOMIC);/* ddl@rock-chips.com:GFP_KERNEL->GFP_ATOMIC */ if (sg_buf == NULL) { DBG("scatter sg buffer allocate failed,no memory!\n"); -- 2.34.1