diff options
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/drm_ioctl.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_pci.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_platform.c | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index aa1ac79bccbc..cb6b54aebd6f 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c | |||
| @@ -189,7 +189,6 @@ drm_unset_busid(struct drm_device *dev, | |||
| 189 | kfree(master->unique); | 189 | kfree(master->unique); |
| 190 | master->unique = NULL; | 190 | master->unique = NULL; |
| 191 | master->unique_len = 0; | 191 | master->unique_len = 0; |
| 192 | master->unique_size = 0; | ||
| 193 | } | 192 | } |
| 194 | 193 | ||
| 195 | /** | 194 | /** |
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index 8efea6b4602b..e266927bb9f1 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c | |||
| @@ -138,7 +138,6 @@ static int drm_pci_set_busid(struct drm_device *dev, struct drm_master *master) | |||
| 138 | return -ENOMEM; | 138 | return -ENOMEM; |
| 139 | 139 | ||
| 140 | master->unique_len = strlen(master->unique); | 140 | master->unique_len = strlen(master->unique); |
| 141 | master->unique_size = master->unique_len + 1; | ||
| 142 | return 0; | 141 | return 0; |
| 143 | } | 142 | } |
| 144 | 143 | ||
| @@ -149,8 +148,7 @@ int drm_pci_set_unique(struct drm_device *dev, | |||
| 149 | int domain, bus, slot, func, ret; | 148 | int domain, bus, slot, func, ret; |
| 150 | 149 | ||
| 151 | master->unique_len = u->unique_len; | 150 | master->unique_len = u->unique_len; |
| 152 | master->unique_size = u->unique_len + 1; | 151 | master->unique = kmalloc(master->unique_len + 1, GFP_KERNEL); |
| 153 | master->unique = kmalloc(master->unique_size, GFP_KERNEL); | ||
| 154 | if (!master->unique) { | 152 | if (!master->unique) { |
| 155 | ret = -ENOMEM; | 153 | ret = -ENOMEM; |
| 156 | goto err; | 154 | goto err; |
diff --git a/drivers/gpu/drm/drm_platform.c b/drivers/gpu/drm/drm_platform.c index 0c09ddd50c15..f197a2b6911a 100644 --- a/drivers/gpu/drm/drm_platform.c +++ b/drivers/gpu/drm/drm_platform.c | |||
| @@ -82,7 +82,6 @@ static int drm_platform_set_busid(struct drm_device *dev, struct drm_master *mas | |||
| 82 | return -ENOMEM; | 82 | return -ENOMEM; |
| 83 | 83 | ||
| 84 | master->unique_len = strlen(master->unique); | 84 | master->unique_len = strlen(master->unique); |
| 85 | master->unique_size = master->unique_len; | ||
| 86 | return 0; | 85 | return 0; |
| 87 | } | 86 | } |
| 88 | 87 | ||
