| Message ID | 1443643027-4301-1-git-send-email-linux@rasmusvillemoes.dk (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, 30 Sep 2015, Rasmus Villemoes <linux@rasmusvillemoes.dk> wrote: > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Reviewed-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/vga/vgaarb.c | 4 +--- > 1 file changed, 1 insertion(+), 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) > return false; > > /* Allocate structure */ > - vgadev = kmalloc(sizeof(struct vga_device), GFP_KERNEL); > + vgadev = kzalloc(sizeof(struct vga_device), GFP_KERNEL); > if (vgadev == NULL) { > pr_err("failed to allocate pci device\n"); > /* > @@ -541,8 +541,6 @@ static bool vga_arbiter_add_pci_device(struct pci_dev *pdev) > return false; > } > > - memset(vgadev, 0, sizeof(*vgadev)); > - > /* Take lock & check for duplicates */ > spin_lock_irqsave(&vga_lock, flags); > if (vgadev_find(pdev) != NULL) { > -- > 2.1.3 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
On Thu, Oct 01, 2015 at 11:26:40AM +0300, Jani Nikula wrote: > On Wed, 30 Sep 2015, Rasmus Villemoes <linux@rasmusvillemoes.dk> wrote: > > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> > > Reviewed-by: Jani Nikula <jani.nikula@intel.com> Applied to drm-misc, thanks. -Daniel > > > --- > > drivers/gpu/vga/vgaarb.c | 4 +--- > > 1 file changed, 1 insertion(+), 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) > > return false; > > > > /* Allocate structure */ > > - vgadev = kmalloc(sizeof(struct vga_device), GFP_KERNEL); > > + vgadev = kzalloc(sizeof(struct vga_device), GFP_KERNEL); > > if (vgadev == NULL) { > > pr_err("failed to allocate pci device\n"); > > /* > > @@ -541,8 +541,6 @@ static bool vga_arbiter_add_pci_device(struct pci_dev *pdev) > > return false; > > } > > > > - memset(vgadev, 0, sizeof(*vgadev)); > > - > > /* Take lock & check for duplicates */ > > spin_lock_irqsave(&vga_lock, flags); > > if (vgadev_find(pdev) != NULL) { > > -- > > 2.1.3 > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/dri-devel > > -- > Jani Nikula, Intel Open Source Technology Center > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
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) return false; /* Allocate structure */ - vgadev = kmalloc(sizeof(struct vga_device), GFP_KERNEL); + vgadev = kzalloc(sizeof(struct vga_device), GFP_KERNEL); if (vgadev == NULL) { pr_err("failed to allocate pci device\n"); /* @@ -541,8 +541,6 @@ static bool vga_arbiter_add_pci_device(struct pci_dev *pdev) return false; } - memset(vgadev, 0, sizeof(*vgadev)); - /* Take lock & check for duplicates */ spin_lock_irqsave(&vga_lock, flags); if (vgadev_find(pdev) != NULL) {
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- drivers/gpu/vga/vgaarb.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)