Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 196493
b: refs/heads/master
c: 6ebc22e
h: refs/heads/master
i:
  196491: b591bfd
v: v3
  • Loading branch information
Julia Lawall authored and Dave Airlie committed May 18, 2010
1 parent e223ec2 commit 8ea3dfc
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 96525a2f7448c427bb8d99240907a6bd2d9e818c
refs/heads/master: 6ebc22e6d06760466859b79d7b3b3edad264a230
3 changes: 1 addition & 2 deletions trunk/drivers/gpu/drm/drm_auth.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,9 @@ static int drm_add_magic(struct drm_master *master, struct drm_file *priv,
struct drm_device *dev = master->minor->dev;
DRM_DEBUG("%d\n", magic);

entry = kmalloc(sizeof(*entry), GFP_KERNEL);
entry = kzalloc(sizeof(*entry), GFP_KERNEL);
if (!entry)
return -ENOMEM;
memset(entry, 0, sizeof(*entry));
entry->priv = priv;
entry->hash_item.key = (unsigned long)magic;
mutex_lock(&dev->struct_mutex);
Expand Down
4 changes: 1 addition & 3 deletions trunk/drivers/gpu/drm/drm_dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,10 @@ int drm_dma_setup(struct drm_device *dev)
{
int i;

dev->dma = kmalloc(sizeof(*dev->dma), GFP_KERNEL);
dev->dma = kzalloc(sizeof(*dev->dma), GFP_KERNEL);
if (!dev->dma)
return -ENOMEM;

memset(dev->dma, 0, sizeof(*dev->dma));

for (i = 0; i <= DRM_MAX_ORDER; i++)
memset(&dev->dma->bufs[i], 0, sizeof(dev->dma->bufs[0]));

Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/gpu/drm/drm_fops.c
Original file line number Diff line number Diff line change
Expand Up @@ -243,11 +243,10 @@ static int drm_open_helper(struct inode *inode, struct file *filp,

DRM_DEBUG("pid = %d, minor = %d\n", task_pid_nr(current), minor_id);

priv = kmalloc(sizeof(*priv), GFP_KERNEL);
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv)
return -ENOMEM;

memset(priv, 0, sizeof(*priv));
filp->private_data = priv;
priv->filp = filp;
priv->uid = current_euid();
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/gpu/drm/savage/savage_bci.c
Original file line number Diff line number Diff line change
Expand Up @@ -539,11 +539,10 @@ int savage_driver_load(struct drm_device *dev, unsigned long chipset)
{
drm_savage_private_t *dev_priv;

dev_priv = kmalloc(sizeof(drm_savage_private_t), GFP_KERNEL);
dev_priv = kzalloc(sizeof(drm_savage_private_t), GFP_KERNEL);
if (dev_priv == NULL)
return -ENOMEM;

memset(dev_priv, 0, sizeof(drm_savage_private_t));
dev->dev_private = (void *)dev_priv;

dev_priv->chipset = (enum savage_family)chipset;
Expand Down

0 comments on commit 8ea3dfc

Please sign in to comment.