diff options
Diffstat (limited to 'drivers/isdn/mISDN/dsp_cmx.c')
-rw-r--r-- | drivers/isdn/mISDN/dsp_cmx.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c index 05866184ba23..9c7c0d1ba55f 100644 --- a/drivers/isdn/mISDN/dsp_cmx.c +++ b/drivers/isdn/mISDN/dsp_cmx.c | |||
@@ -238,7 +238,7 @@ dsp_cmx_add_conf_member(struct dsp *dsp, struct dsp_conf *conf) | |||
238 | 238 | ||
239 | member = kzalloc(sizeof(struct dsp_conf_member), GFP_ATOMIC); | 239 | member = kzalloc(sizeof(struct dsp_conf_member), GFP_ATOMIC); |
240 | if (!member) { | 240 | if (!member) { |
241 | printk(KERN_ERR "kmalloc struct dsp_conf_member failed\n"); | 241 | printk(KERN_ERR "kzalloc struct dsp_conf_member failed\n"); |
242 | return -ENOMEM; | 242 | return -ENOMEM; |
243 | } | 243 | } |
244 | member->dsp = dsp; | 244 | member->dsp = dsp; |
@@ -317,7 +317,7 @@ static struct dsp_conf | |||
317 | 317 | ||
318 | conf = kzalloc(sizeof(struct dsp_conf), GFP_ATOMIC); | 318 | conf = kzalloc(sizeof(struct dsp_conf), GFP_ATOMIC); |
319 | if (!conf) { | 319 | if (!conf) { |
320 | printk(KERN_ERR "kmalloc struct dsp_conf failed\n"); | 320 | printk(KERN_ERR "kzalloc struct dsp_conf failed\n"); |
321 | return NULL; | 321 | return NULL; |
322 | } | 322 | } |
323 | INIT_LIST_HEAD(&conf->mlist); | 323 | INIT_LIST_HEAD(&conf->mlist); |
@@ -1389,7 +1389,8 @@ dsp_cmx_send_member(struct dsp *dsp, int len, s32 *c, int members) | |||
1389 | while (r != rr && t != tt) { | 1389 | while (r != rr && t != tt) { |
1390 | #ifdef CMX_TX_DEBUG | 1390 | #ifdef CMX_TX_DEBUG |
1391 | if (strlen(debugbuf) < 48) | 1391 | if (strlen(debugbuf) < 48) |
1392 | sprintf(debugbuf+strlen(debugbuf), " %02x", p[t]); | 1392 | sprintf(debugbuf+strlen(debugbuf), " %02x", |
1393 | p[t]); | ||
1393 | #endif | 1394 | #endif |
1394 | *d++ = p[t]; /* write tx_buff */ | 1395 | *d++ = p[t]; /* write tx_buff */ |
1395 | t = (t+1) & CMX_BUFF_MASK; | 1396 | t = (t+1) & CMX_BUFF_MASK; |