diff options
| author | Dave Airlie <airlied@linux.ie> | 2004-07-20 11:22:26 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2004-07-20 11:22:26 +0000 |
| commit | fdb6ae31cb721a928d058d7419444f55eb60a542 (patch) | |
| tree | 271b4e3569d581f31b2e8c731c9ac9e722cf0fa3 | |
| parent | 7ee263b94f77cadab659207344c82d5528d498cb (diff) | |
fix some more NULLs from kernel
| -rw-r--r-- | linux-core/drm_bufs.c | 2 | ||||
| -rw-r--r-- | linux-core/i810_dma.c | 4 | ||||
| -rw-r--r-- | linux/drm_bufs.h | 2 | ||||
| -rw-r--r-- | linux/i810_dma.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/linux-core/drm_bufs.c b/linux-core/drm_bufs.c index 69511f91..38ddb790 100644 --- a/linux-core/drm_bufs.c +++ b/linux-core/drm_bufs.c @@ -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), diff --git a/linux-core/i810_dma.c b/linux-core/i810_dma.c index 308d28eb..144ce113 100644 --- a/linux-core/i810_dma.c +++ b/linux-core/i810_dma.c @@ -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; } diff --git a/linux/drm_bufs.h b/linux/drm_bufs.h index 69511f91..38ddb790 100644 --- a/linux/drm_bufs.h +++ b/linux/drm_bufs.h @@ -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), diff --git a/linux/i810_dma.c b/linux/i810_dma.c index 308d28eb..144ce113 100644 --- a/linux/i810_dma.c +++ b/linux/i810_dma.c @@ -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; } |