diff options
author | Dave Airlie <airlied@redhat.com> | 2013-01-24 23:18:32 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-01-24 23:18:32 -0500 |
commit | 4af6924b8adce0c408ec3f366c42a61e0c304b28 (patch) | |
tree | 25511ec44e9a64119794447da5dfebf8b16e2a57 /drivers/gpu/drm/radeon/radeon_cs.c | |
parent | 014b34409fb2015f63663b6cafdf557fdf289628 (diff) | |
parent | b3dfcb207e550dffb8680cab7afaf6b4fb6eae33 (diff) |
Merge branch 'drm-fixes-3.8' of git://people.freedesktop.org/~agd5f/linux into drm-next
Alex writes:
Just some small misc fixes.
* 'drm-fixes-3.8' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: Enable DMA_IB_SWAP_ENABLE on big endian hosts.
drm/radeon: fix a rare case of double kfree
radeon_display: Use pointer return error codes
drm/radeon: fix cursor corruption on DCE6 and newer
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_cs.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_cs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index 469661fd1903..5407459e56d2 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c | |||
@@ -286,6 +286,8 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data) | |||
286 | p->chunks[p->chunk_ib_idx].kpage[1] == NULL) { | 286 | p->chunks[p->chunk_ib_idx].kpage[1] == NULL) { |
287 | kfree(p->chunks[p->chunk_ib_idx].kpage[0]); | 287 | kfree(p->chunks[p->chunk_ib_idx].kpage[0]); |
288 | kfree(p->chunks[p->chunk_ib_idx].kpage[1]); | 288 | kfree(p->chunks[p->chunk_ib_idx].kpage[1]); |
289 | p->chunks[p->chunk_ib_idx].kpage[0] = NULL; | ||
290 | p->chunks[p->chunk_ib_idx].kpage[1] = NULL; | ||
289 | return -ENOMEM; | 291 | return -ENOMEM; |
290 | } | 292 | } |
291 | } | 293 | } |