diff options
author | Rasmus Villemoes <linux@rasmusvillemoes.dk> | 2015-09-30 15:57:06 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-10-01 05:25:23 -0400 |
commit | 945ef5bb146e65c58edb866eb0708e98224e54ab (patch) | |
tree | 0008a8247a8576365e0f304de17581450a1fc627 | |
parent | fa4270d8e0257b4b76f11baa2866f4313d29aaf5 (diff) |
vgaarb: use kzalloc in vga_arbiter_add_pci_device()
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/vga/vgaarb.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c index a0b433456107..3166e4bc4eb6 100644 --- a/drivers/gpu/vga/vgaarb.c +++ b/drivers/gpu/vga/vgaarb.c | |||
@@ -531,7 +531,7 @@ static bool vga_arbiter_add_pci_device(struct pci_dev *pdev) | |||
531 | return false; | 531 | return false; |
532 | 532 | ||
533 | /* Allocate structure */ | 533 | /* Allocate structure */ |
534 | vgadev = kmalloc(sizeof(struct vga_device), GFP_KERNEL); | 534 | vgadev = kzalloc(sizeof(struct vga_device), GFP_KERNEL); |
535 | if (vgadev == NULL) { | 535 | if (vgadev == NULL) { |
536 | pr_err("failed to allocate pci device\n"); | 536 | pr_err("failed to allocate pci device\n"); |
537 | /* | 537 | /* |
@@ -541,8 +541,6 @@ static bool vga_arbiter_add_pci_device(struct pci_dev *pdev) | |||
541 | return false; | 541 | return false; |
542 | } | 542 | } |
543 | 543 | ||
544 | memset(vgadev, 0, sizeof(*vgadev)); | ||
545 | |||
546 | /* Take lock & check for duplicates */ | 544 | /* Take lock & check for duplicates */ |
547 | spin_lock_irqsave(&vga_lock, flags); | 545 | spin_lock_irqsave(&vga_lock, flags); |
548 | if (vgadev_find(pdev) != NULL) { | 546 | if (vgadev_find(pdev) != NULL) { |