diff --git a/[refs] b/[refs] index 53fc0e55e262..38a6d4622bcf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0428fec32c5fde013cb8223c248972941b18ca59 +refs/heads/master: 34a678110ac5d2f1b694c8b9df5cccb1a2607721 diff --git a/trunk/drivers/staging/vme/devices/vme_user.c b/trunk/drivers/staging/vme/devices/vme_user.c index 91d2cc7bb4c3..3cbeb2ada418 100644 --- a/trunk/drivers/staging/vme/devices/vme_user.c +++ b/trunk/drivers/staging/vme/devices/vme_user.c @@ -651,7 +651,7 @@ static int __init vme_user_init(void) /* Dynamically create the bind table based on module parameters */ - ids = kmalloc(sizeof(struct vme_device_id) * (bus_num + 1), GFP_KERNEL); + ids = kzalloc(sizeof(struct vme_device_id) * (bus_num + 1), GFP_KERNEL); if (ids == NULL) { printk(KERN_ERR "%s: Unable to allocate ID table\n", driver_name); @@ -659,8 +659,6 @@ static int __init vme_user_init(void) goto err_id; } - memset(ids, 0, (sizeof(struct vme_device_id) * (bus_num + 1))); - for (i = 0; i < bus_num; i++) { ids[i].bus = bus[i]; /*