Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 44782
b: refs/heads/master
c: 66eb2e9
h: refs/heads/master
v: v3
  • Loading branch information
Burman Yan authored and Greg Kroah-Hartman committed Dec 20, 2006
1 parent 97c530c commit f7b726a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 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: 071e0a2aee9c289f50b9329d0c26474ca94f7c7a
refs/heads/master: 66eb2e93b99b79bd3d55ecea2098a8369c1ded0d
6 changes: 2 additions & 4 deletions trunk/drivers/usb/misc/auerswald.c
Original file line number Diff line number Diff line change
Expand Up @@ -1376,15 +1376,14 @@ static int auerchar_open (struct inode *inode, struct file *file)
}

/* we have access to the device. Now lets allocate memory */
ccp = (pauerchar_t) kmalloc(sizeof(auerchar_t), GFP_KERNEL);
ccp = kzalloc(sizeof(auerchar_t), GFP_KERNEL);
if (ccp == NULL) {
err ("out of memory");
ret = -ENOMEM;
goto ofail;
}

/* Initialize device descriptor */
memset( ccp, 0, sizeof(auerchar_t));
init_MUTEX( &ccp->mutex);
init_MUTEX( &ccp->readmutex);
auerbuf_init (&ccp->bufctl);
Expand Down Expand Up @@ -1912,14 +1911,13 @@ static int auerswald_probe (struct usb_interface *intf,
return -ENODEV;

/* allocate memory for our device and initialize it */
cp = kmalloc (sizeof(auerswald_t), GFP_KERNEL);
cp = kzalloc (sizeof(auerswald_t), GFP_KERNEL);
if (cp == NULL) {
err ("out of memory");
goto pfail;
}

/* Initialize device descriptor */
memset (cp, 0, sizeof(auerswald_t));
init_MUTEX (&cp->mutex);
cp->usbdev = usbdev;
auerchain_init (&cp->controlchain);
Expand Down

0 comments on commit f7b726a

Please sign in to comment.