diff options
| -rw-r--r-- | drivers/gpu/drm/drm_fb_cma_helper.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_gem_cma_helper.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c index b7d5b848d2f8..5543fa806aec 100644 --- a/drivers/gpu/drm/drm_fb_cma_helper.c +++ b/drivers/gpu/drm/drm_fb_cma_helper.c | |||
| @@ -266,7 +266,7 @@ static int drm_fbdev_cma_create(struct drm_fb_helper *helper, | |||
| 266 | fbi = drm_fb_helper_alloc_fbi(helper); | 266 | fbi = drm_fb_helper_alloc_fbi(helper); |
| 267 | if (IS_ERR(fbi)) { | 267 | if (IS_ERR(fbi)) { |
| 268 | ret = PTR_ERR(fbi); | 268 | ret = PTR_ERR(fbi); |
| 269 | goto err_drm_gem_cma_free_object; | 269 | goto err_gem_free_object; |
| 270 | } | 270 | } |
| 271 | 271 | ||
| 272 | fbdev_cma->fb = drm_fb_cma_alloc(dev, &mode_cmd, &obj, 1); | 272 | fbdev_cma->fb = drm_fb_cma_alloc(dev, &mode_cmd, &obj, 1); |
| @@ -299,8 +299,8 @@ static int drm_fbdev_cma_create(struct drm_fb_helper *helper, | |||
| 299 | 299 | ||
| 300 | err_fb_info_destroy: | 300 | err_fb_info_destroy: |
| 301 | drm_fb_helper_release_fbi(helper); | 301 | drm_fb_helper_release_fbi(helper); |
| 302 | err_drm_gem_cma_free_object: | 302 | err_gem_free_object: |
| 303 | drm_gem_cma_free_object(&obj->base); | 303 | dev->driver->gem_free_object(&obj->base); |
| 304 | return ret; | 304 | return ret; |
| 305 | } | 305 | } |
| 306 | 306 | ||
diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c index 0f7b00ba57da..e5df53b6e229 100644 --- a/drivers/gpu/drm/drm_gem_cma_helper.c +++ b/drivers/gpu/drm/drm_gem_cma_helper.c | |||
| @@ -121,7 +121,7 @@ struct drm_gem_cma_object *drm_gem_cma_create(struct drm_device *drm, | |||
| 121 | return cma_obj; | 121 | return cma_obj; |
| 122 | 122 | ||
| 123 | error: | 123 | error: |
| 124 | drm_gem_cma_free_object(&cma_obj->base); | 124 | drm->driver->gem_free_object(&cma_obj->base); |
| 125 | return ERR_PTR(ret); | 125 | return ERR_PTR(ret); |
| 126 | } | 126 | } |
| 127 | EXPORT_SYMBOL_GPL(drm_gem_cma_create); | 127 | EXPORT_SYMBOL_GPL(drm_gem_cma_create); |
| @@ -171,7 +171,7 @@ drm_gem_cma_create_with_handle(struct drm_file *file_priv, | |||
| 171 | return cma_obj; | 171 | return cma_obj; |
| 172 | 172 | ||
| 173 | err_handle_create: | 173 | err_handle_create: |
| 174 | drm_gem_cma_free_object(gem_obj); | 174 | drm->driver->gem_free_object(gem_obj); |
| 175 | 175 | ||
| 176 | return ERR_PTR(ret); | 176 | return ERR_PTR(ret); |
| 177 | } | 177 | } |
