diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /drivers/usb/misc/cytherm.c | |
parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) |
Merge branch 'linus'
Diffstat (limited to 'drivers/usb/misc/cytherm.c')
-rw-r--r-- | drivers/usb/misc/cytherm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/misc/cytherm.c b/drivers/usb/misc/cytherm.c index 6671317b495f..a04204292aa3 100644 --- a/drivers/usb/misc/cytherm.c +++ b/drivers/usb/misc/cytherm.c | |||
@@ -351,12 +351,11 @@ static int cytherm_probe(struct usb_interface *interface, | |||
351 | struct usb_cytherm *dev = NULL; | 351 | struct usb_cytherm *dev = NULL; |
352 | int retval = -ENOMEM; | 352 | int retval = -ENOMEM; |
353 | 353 | ||
354 | dev = kmalloc (sizeof(struct usb_cytherm), GFP_KERNEL); | 354 | dev = kzalloc (sizeof(struct usb_cytherm), GFP_KERNEL); |
355 | if (dev == NULL) { | 355 | if (dev == NULL) { |
356 | dev_err (&interface->dev, "Out of memory\n"); | 356 | dev_err (&interface->dev, "Out of memory\n"); |
357 | goto error; | 357 | goto error; |
358 | } | 358 | } |
359 | memset (dev, 0x00, sizeof (*dev)); | ||
360 | 359 | ||
361 | dev->udev = usb_get_dev(udev); | 360 | dev->udev = usb_get_dev(udev); |
362 | 361 | ||