diff options
| author | mattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-03-09 20:05:17 +0000 |
|---|---|---|
| committer | mattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-03-09 20:05:17 +0000 |
| commit | 24a61b9c810fa598a3aff13356efb5116e9498f1 (patch) | |
| tree | 1be848169eeb9459854d1321493dba65e854fe49 | |
| parent | bb2123edb3d6ac5b8b27b6ed6af8288d2c781274 (diff) | |
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
........
................
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2303 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -rw-r--r-- | wct4xxp/vpm450m.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wct4xxp/vpm450m.c b/wct4xxp/vpm450m.c index 4e5fa91..b56c245 100644 --- a/wct4xxp/vpm450m.c +++ b/wct4xxp/vpm450m.c @@ -209,7 +209,7 @@ static void vpm450m_setecmode(struct vpm450m *vpm450m, int channel, int mode) 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; |