diff options
| author | Eric Sesterhenn <snakebyte@gmx.de> | 2006-02-27 21:29:43 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-03-20 14:49:59 -0800 |
| commit | 80b6ca48321974a6566a1c9048ba34f60420bca6 (patch) | |
| tree | a350e3cf6b794081c13c89d5b1913b2c1207570d /drivers/usb/media/stv680.c | |
| parent | d54a5cb6484705f7808b337917cc7598f2f971c3 (diff) | |
[PATCH] USB: kzalloc() conversion for rest of drivers/usb
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/media/stv680.c')
| -rw-r--r-- | drivers/usb/media/stv680.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/usb/media/stv680.c b/drivers/usb/media/stv680.c index b1a6be2958e..9636da20748 100644 --- a/drivers/usb/media/stv680.c +++ b/drivers/usb/media/stv680.c @@ -318,12 +318,11 @@ static int stv_init (struct usb_stv *stv680) unsigned char *buffer; unsigned long int bufsize; - buffer = kmalloc (40, GFP_KERNEL); + buffer = kzalloc (40, GFP_KERNEL); if (buffer == NULL) { PDEBUG (0, "STV(e): Out of (small buf) memory"); return -1; } - memset (buffer, 0, 40); udelay (100); /* set config 1, interface 0, alternate 0 */ @@ -1388,14 +1387,12 @@ static int stv680_probe (struct usb_interface *intf, const struct usb_device_id goto error; } /* We found one */ - if ((stv680 = kmalloc (sizeof (*stv680), GFP_KERNEL)) == NULL) { + if ((stv680 = kzalloc (sizeof (*stv680), GFP_KERNEL)) == NULL) { PDEBUG (0, "STV(e): couldn't kmalloc stv680 struct."); retval = -ENOMEM; goto error; } - memset (stv680, 0, sizeof (*stv680)); - stv680->udev = dev; stv680->camera_name = camera_name; |