VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / char / drm / drm_dma.h

diff --git a/drivers/char/drm/drm_dma.h b/drivers/char/drm/drm_dma.h
index f0230eb..7212275 100644 (file)
--- a/drivers/char/drm/drm_dma.h
+++ b/drivers/char/drm/drm_dma.h
@@ -152,7 +152,7 @@ void DRM(free_buffer)(drm_device_t *dev, drm_buf_t *buf)
 
        buf->waiting  = 0;
        buf->pending  = 0;
-       buf->filp     = 0;
+       buf->filp     = NULL;
        buf->used     = 0;
 
        if ( __HAVE_DMA_WAITQUEUE && waitqueue_active(&buf->dma_wait)) {
@@ -214,7 +214,7 @@ int DRM(control)( struct inode *inode, struct file *filp,
 {
        drm_control_t ctl;
 
-       if ( copy_from_user( &ctl, (drm_control_t *)arg, sizeof(ctl) ) )
+       if ( copy_from_user( &ctl, (drm_control_t __user *)arg, sizeof(ctl) ) )
                return -EFAULT;
 
        switch ( ctl.func ) {