diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2012-03-17 13:57:02 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-03-20 04:45:31 -0400 |
commit | f10487658a0e5fd793ee5ba7ad645c060e4afbcd (patch) | |
tree | 1679201437b50a964a8445c50a00c6009e756579 /drivers/gpu/drm | |
parent | f48bb04a56fd1f582a45f3882255477417bc0ed7 (diff) |
drivers/gpu/drm/savage/savage_state.c: add missing kfree
Most of the error handling code in this function frees the buffers
kcmd_addr, kvb_addr, and kbox_addr allocated at the beginning of this
function. These two branches are changed to do the same.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/savage/savage_state.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/savage/savage_state.c b/drivers/gpu/drm/savage/savage_state.c index 8a3e31599c9..031aaaf79ac 100644 --- a/drivers/gpu/drm/savage/savage_state.c +++ b/drivers/gpu/drm/savage/savage_state.c | |||
@@ -1057,7 +1057,8 @@ int savage_bci_cmdbuf(struct drm_device *dev, void *data, struct drm_file *file_ | |||
1057 | DRM_ERROR("indexed drawing command extends " | 1057 | DRM_ERROR("indexed drawing command extends " |
1058 | "beyond end of command buffer\n"); | 1058 | "beyond end of command buffer\n"); |
1059 | DMA_FLUSH(); | 1059 | DMA_FLUSH(); |
1060 | return -EINVAL; | 1060 | ret = -EINVAL; |
1061 | goto done; | ||
1061 | } | 1062 | } |
1062 | /* fall through */ | 1063 | /* fall through */ |
1063 | case SAVAGE_CMD_DMA_PRIM: | 1064 | case SAVAGE_CMD_DMA_PRIM: |
@@ -1076,7 +1077,7 @@ int savage_bci_cmdbuf(struct drm_device *dev, void *data, struct drm_file *file_ | |||
1076 | cmdbuf->vb_stride, | 1077 | cmdbuf->vb_stride, |
1077 | cmdbuf->nbox, cmdbuf->box_addr); | 1078 | cmdbuf->nbox, cmdbuf->box_addr); |
1078 | if (ret != 0) | 1079 | if (ret != 0) |
1079 | return ret; | 1080 | goto done; |
1080 | first_draw_cmd = NULL; | 1081 | first_draw_cmd = NULL; |
1081 | } | 1082 | } |
1082 | } | 1083 | } |