diff options
Diffstat (limited to 'char.c')
-rw-r--r-- | char.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -83,7 +83,7 @@ int alloc_texture(struct doomdev_ioctl_create_texture *params, GFP_KERNEL); ORFAIL_NULL(texture_data->texture_cpu, -ENOMEM, error_texture); - texture_data->page_table_cpu = + texture_data->page_table_cpu = dma_alloc_coherent(texture_data->doom_data->pci_device, pages_needed * 4, &texture_data->page_table_dev, GFP_KERNEL); @@ -100,7 +100,6 @@ int alloc_texture(struct doomdev_ioctl_create_texture *params, (void __user *) params->data_ptr, params->size); - if (not_written) { err = -EFAULT; goto error_copy; @@ -150,7 +149,7 @@ long doom_create_texture(struct file *filp, unsigned long arg) ORFAIL_NULL(texture_data, -ENOMEM, error_data); doom_data = container_of(filp->f_inode->i_cdev, struct doom_data, cdev); texture_data->doom_data = doom_data; - + ORFAIL(alloc_texture(params, texture_data), error_texture); fd = anon_inode_getfd("doom_texture", &texture_fops, texture_data, 0); @@ -202,7 +201,6 @@ int alloc_flat(struct doomdev_ioctl_create_flat *params, (void __user *) params->data_ptr, HARDDOOM_FLAT_SIZE); if (not_written) { - p("some bytes not copied\n"); err = -EFAULT; goto error_copy; } @@ -237,7 +235,7 @@ long doom_create_flat(struct file *filp, unsigned long arg) ORFAIL_NULL(flat_data, -ENOMEM, error_data); doom_data = container_of(filp->f_inode->i_cdev, struct doom_data, cdev); flat_data->doom_data = doom_data; - + ORFAIL(alloc_flat(params, flat_data), error_flat); fd = anon_inode_getfd("doom_texture", &flat_fops, flat_data, 0); @@ -285,7 +283,7 @@ struct file_operations doomdev_fops = { .compat_ioctl = doom_ioctl, .open = doom_open }; - + struct class *doom_class; int new_doomdev(struct pci_dev *dev) |