fix some more NULLs from kernel
parent
7ee263b94f
commit
fdb6ae31cb
|
@ -877,7 +877,7 @@ int DRM(addbufs_sg)( struct inode *inode, struct file *filp,
|
|||
buf->waiting = 0;
|
||||
buf->pending = 0;
|
||||
init_waitqueue_head( &buf->dma_wait );
|
||||
buf->filp = 0;
|
||||
buf->filp = NULL;
|
||||
|
||||
buf->dev_priv_size = sizeof(DRIVER_BUF_PRIV_T);
|
||||
buf->dev_private = DRM(alloc)( sizeof(DRIVER_BUF_PRIV_T),
|
||||
|
|
|
@ -178,7 +178,7 @@ static int i810_map_buffer(drm_buf_t *buf, struct file *filp)
|
|||
/* Real error */
|
||||
DRM_ERROR("mmap error\n");
|
||||
retcode = (signed int)buf_priv->virtual;
|
||||
buf_priv->virtual = 0;
|
||||
buf_priv->virtual = NULL;
|
||||
}
|
||||
up_write( ¤t->mm->mmap_sem );
|
||||
|
||||
|
@ -200,7 +200,7 @@ static int i810_unmap_buffer(drm_buf_t *buf)
|
|||
up_write(¤t->mm->mmap_sem);
|
||||
|
||||
buf_priv->currently_mapped = I810_BUF_UNMAPPED;
|
||||
buf_priv->virtual = 0;
|
||||
buf_priv->virtual = NULL;
|
||||
|
||||
return retcode;
|
||||
}
|
||||
|
|
|
@ -877,7 +877,7 @@ int DRM(addbufs_sg)( struct inode *inode, struct file *filp,
|
|||
buf->waiting = 0;
|
||||
buf->pending = 0;
|
||||
init_waitqueue_head( &buf->dma_wait );
|
||||
buf->filp = 0;
|
||||
buf->filp = NULL;
|
||||
|
||||
buf->dev_priv_size = sizeof(DRIVER_BUF_PRIV_T);
|
||||
buf->dev_private = DRM(alloc)( sizeof(DRIVER_BUF_PRIV_T),
|
||||
|
|
|
@ -178,7 +178,7 @@ static int i810_map_buffer(drm_buf_t *buf, struct file *filp)
|
|||
/* Real error */
|
||||
DRM_ERROR("mmap error\n");
|
||||
retcode = (signed int)buf_priv->virtual;
|
||||
buf_priv->virtual = 0;
|
||||
buf_priv->virtual = NULL;
|
||||
}
|
||||
up_write( ¤t->mm->mmap_sem );
|
||||
|
||||
|
@ -200,7 +200,7 @@ static int i810_unmap_buffer(drm_buf_t *buf)
|
|||
up_write(¤t->mm->mmap_sem);
|
||||
|
||||
buf_priv->currently_mapped = I810_BUF_UNMAPPED;
|
||||
buf_priv->virtual = 0;
|
||||
buf_priv->virtual = NULL;
|
||||
|
||||
return retcode;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue