diff options
Diffstat (limited to 'drivers/gpu/drm/i830/i830_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i830/i830_dma.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i830/i830_dma.c b/drivers/gpu/drm/i830/i830_dma.c index a86ab30b4620..877bf6cb14a4 100644 --- a/drivers/gpu/drm/i830/i830_dma.c +++ b/drivers/gpu/drm/i830/i830_dma.c | |||
| @@ -232,8 +232,7 @@ static int i830_dma_cleanup(struct drm_device * dev) | |||
| 232 | I830_WRITE(0x02080, 0x1ffff000); | 232 | I830_WRITE(0x02080, 0x1ffff000); |
| 233 | } | 233 | } |
| 234 | 234 | ||
| 235 | drm_free(dev->dev_private, sizeof(drm_i830_private_t), | 235 | kfree(dev->dev_private); |
| 236 | DRM_MEM_DRIVER); | ||
| 237 | dev->dev_private = NULL; | 236 | dev->dev_private = NULL; |
| 238 | 237 | ||
| 239 | for (i = 0; i < dma->buf_count; i++) { | 238 | for (i = 0; i < dma->buf_count; i++) { |
| @@ -459,8 +458,7 @@ static int i830_dma_init(struct drm_device *dev, void *data, | |||
| 459 | 458 | ||
| 460 | switch (init->func) { | 459 | switch (init->func) { |
| 461 | case I830_INIT_DMA: | 460 | case I830_INIT_DMA: |
| 462 | dev_priv = drm_alloc(sizeof(drm_i830_private_t), | 461 | dev_priv = kmalloc(sizeof(drm_i830_private_t), GFP_KERNEL); |
| 463 | DRM_MEM_DRIVER); | ||
| 464 | if (dev_priv == NULL) | 462 | if (dev_priv == NULL) |
| 465 | return -ENOMEM; | 463 | return -ENOMEM; |
| 466 | retcode = i830_dma_initialize(dev, dev_priv, init); | 464 | retcode = i830_dma_initialize(dev, dev_priv, init); |
