[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>

1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/usb/media/stv680.c b/drivers/usb/media/stv680.c
index b1a6be2958ed..9636da20748d 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;