Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 264799
b: refs/heads/master
c: 1ac4594
h: refs/heads/master
i:
  264797: 52a6f39
  264795: d12c2df
  264791: 367bd8c
  264783: 5c188e9
  264767: 3fb005a
v: v3
  • Loading branch information
Joe Perches authored and Jiri Kosina committed Sep 15, 2011
1 parent 5962640 commit 7db8b71
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8e03bd6525d3281068519d5f6059cdcc5a67af66
refs/heads/master: 1ac4594d88f63ba1557cc1a30ec1f915ca55b7cb
4 changes: 2 additions & 2 deletions trunk/drivers/isdn/i4l/isdn_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -2308,11 +2308,11 @@ static int __init isdn_init(void)
int i;
char tmprev[50];

if (!(dev = vmalloc(sizeof(isdn_dev)))) {
dev = vzalloc(sizeof(isdn_dev));
if (!dev) {
printk(KERN_WARNING "isdn: Could not allocate device-struct.\n");
return -EIO;
}
memset((char *) dev, 0, sizeof(isdn_dev));
init_timer(&dev->timer);
dev->timer.function = isdn_timer_funct;
spin_lock_init(&dev->lock);
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/isdn/mISDN/dsp_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1052,12 +1052,11 @@ dspcreate(struct channel_req *crq)
if (crq->protocol != ISDN_P_B_L2DSP
&& crq->protocol != ISDN_P_B_L2DSPHDLC)
return -EPROTONOSUPPORT;
ndsp = vmalloc(sizeof(struct dsp));
ndsp = vzalloc(sizeof(struct dsp));
if (!ndsp) {
printk(KERN_ERR "%s: vmalloc struct dsp failed\n", __func__);
return -ENOMEM;
}
memset(ndsp, 0, sizeof(struct dsp));
if (dsp_debug & DEBUG_DSP_CTRL)
printk(KERN_DEBUG "%s: creating new dsp instance\n", __func__);

Expand Down
6 changes: 2 additions & 4 deletions trunk/drivers/isdn/mISDN/l1oip_codec.c
Original file line number Diff line number Diff line change
Expand Up @@ -330,14 +330,12 @@ l1oip_4bit_alloc(int ulaw)
return 0;

/* alloc conversion tables */
table_com = vmalloc(65536);
table_dec = vmalloc(512);
table_com = vzalloc(65536);
table_dec = vzalloc(512);
if (!table_com || !table_dec) {
l1oip_4bit_free();
return -ENOMEM;
}
memset(table_com, 0, 65536);
memset(table_dec, 0, 512);
/* generate compression table */
i1 = 0;
while (i1 < 256) {
Expand Down

0 comments on commit 7db8b71

Please sign in to comment.