diff options
author | Joe Perches <joe@perches.com> | 2011-05-28 13:36:26 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 07:55:03 -0400 |
commit | 1ac4594d88f63ba1557cc1a30ec1f915ca55b7cb (patch) | |
tree | 53dbcfcf17b0b40c18fdb6aeb8c181f665f82a99 /drivers/isdn/i4l | |
parent | 8e03bd6525d3281068519d5f6059cdcc5a67af66 (diff) |
isdn: Convert vmalloc/memset to vzalloc
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/isdn/i4l')
-rw-r--r-- | drivers/isdn/i4l/isdn_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c index 6ed82add6ffa..6ddb795e31c5 100644 --- a/drivers/isdn/i4l/isdn_common.c +++ b/drivers/isdn/i4l/isdn_common.c | |||
@@ -2308,11 +2308,11 @@ static int __init isdn_init(void) | |||
2308 | int i; | 2308 | int i; |
2309 | char tmprev[50]; | 2309 | char tmprev[50]; |
2310 | 2310 | ||
2311 | if (!(dev = vmalloc(sizeof(isdn_dev)))) { | 2311 | dev = vzalloc(sizeof(isdn_dev)); |
2312 | if (!dev) { | ||
2312 | printk(KERN_WARNING "isdn: Could not allocate device-struct.\n"); | 2313 | printk(KERN_WARNING "isdn: Could not allocate device-struct.\n"); |
2313 | return -EIO; | 2314 | return -EIO; |
2314 | } | 2315 | } |
2315 | memset((char *) dev, 0, sizeof(isdn_dev)); | ||
2316 | init_timer(&dev->timer); | 2316 | init_timer(&dev->timer); |
2317 | dev->timer.function = isdn_timer_funct; | 2317 | dev->timer.function = isdn_timer_funct; |
2318 | spin_lock_init(&dev->lock); | 2318 | spin_lock_init(&dev->lock); |