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/usblcd.c | |
parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) |
Merge branch 'linus'
Diffstat (limited to 'drivers/usb/misc/usblcd.c')
-rw-r--r-- | drivers/usb/misc/usblcd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/misc/usblcd.c b/drivers/usb/misc/usblcd.c index cc3dae3f34e0..c82c402285a0 100644 --- a/drivers/usb/misc/usblcd.c +++ b/drivers/usb/misc/usblcd.c | |||
@@ -270,12 +270,11 @@ static int lcd_probe(struct usb_interface *interface, const struct usb_device_id | |||
270 | int retval = -ENOMEM; | 270 | int retval = -ENOMEM; |
271 | 271 | ||
272 | /* allocate memory for our device state and initialize it */ | 272 | /* allocate memory for our device state and initialize it */ |
273 | dev = kmalloc(sizeof(*dev), GFP_KERNEL); | 273 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); |
274 | if (dev == NULL) { | 274 | if (dev == NULL) { |
275 | err("Out of memory"); | 275 | err("Out of memory"); |
276 | goto error; | 276 | goto error; |
277 | } | 277 | } |
278 | memset(dev, 0x00, sizeof(*dev)); | ||
279 | kref_init(&dev->kref); | 278 | kref_init(&dev->kref); |
280 | 279 | ||
281 | dev->udev = usb_get_dev(interface_to_usbdev(interface)); | 280 | dev->udev = usb_get_dev(interface_to_usbdev(interface)); |