diff options
Diffstat (limited to 'drivers/gpu/drm/drm_ioctl.c')
| -rw-r--r-- | drivers/gpu/drm/drm_ioctl.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index 1fad76289e66..9b9ff46c2378 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c | |||
| @@ -93,7 +93,7 @@ int drm_setunique(struct drm_device *dev, void *data, | |||
| 93 | 93 | ||
| 94 | master->unique_len = u->unique_len; | 94 | master->unique_len = u->unique_len; |
| 95 | master->unique_size = u->unique_len + 1; | 95 | master->unique_size = u->unique_len + 1; |
| 96 | master->unique = drm_alloc(master->unique_size, DRM_MEM_DRIVER); | 96 | master->unique = kmalloc(master->unique_size, GFP_KERNEL); |
| 97 | if (!master->unique) | 97 | if (!master->unique) |
| 98 | return -ENOMEM; | 98 | return -ENOMEM; |
| 99 | if (copy_from_user(master->unique, u->unique, master->unique_len)) | 99 | if (copy_from_user(master->unique, u->unique, master->unique_len)) |
| @@ -101,9 +101,8 @@ int drm_setunique(struct drm_device *dev, void *data, | |||
| 101 | 101 | ||
| 102 | master->unique[master->unique_len] = '\0'; | 102 | master->unique[master->unique_len] = '\0'; |
| 103 | 103 | ||
| 104 | dev->devname = | 104 | dev->devname = kmalloc(strlen(dev->driver->pci_driver.name) + |
| 105 | drm_alloc(strlen(dev->driver->pci_driver.name) + | 105 | strlen(master->unique) + 2, GFP_KERNEL); |
| 106 | strlen(master->unique) + 2, DRM_MEM_DRIVER); | ||
| 107 | if (!dev->devname) | 106 | if (!dev->devname) |
| 108 | return -ENOMEM; | 107 | return -ENOMEM; |
| 109 | 108 | ||
| @@ -138,7 +137,7 @@ static int drm_set_busid(struct drm_device *dev, struct drm_file *file_priv) | |||
| 138 | 137 | ||
| 139 | master->unique_len = 40; | 138 | master->unique_len = 40; |
| 140 | master->unique_size = master->unique_len; | 139 | master->unique_size = master->unique_len; |
| 141 | master->unique = drm_alloc(master->unique_size, DRM_MEM_DRIVER); | 140 | master->unique = kmalloc(master->unique_size, GFP_KERNEL); |
| 142 | if (master->unique == NULL) | 141 | if (master->unique == NULL) |
| 143 | return -ENOMEM; | 142 | return -ENOMEM; |
| 144 | 143 | ||
| @@ -152,9 +151,8 @@ static int drm_set_busid(struct drm_device *dev, struct drm_file *file_priv) | |||
| 152 | else | 151 | else |
| 153 | master->unique_len = len; | 152 | master->unique_len = len; |
| 154 | 153 | ||
| 155 | dev->devname = | 154 | dev->devname = kmalloc(strlen(dev->driver->pci_driver.name) + |
| 156 | drm_alloc(strlen(dev->driver->pci_driver.name) + master->unique_len + | 155 | master->unique_len + 2, GFP_KERNEL); |
| 157 | 2, DRM_MEM_DRIVER); | ||
| 158 | if (dev->devname == NULL) | 156 | if (dev->devname == NULL) |
| 159 | return -ENOMEM; | 157 | return -ENOMEM; |
| 160 | 158 | ||
