summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Engestrom <eric@engestrom.ch>2017-07-30 21:27:39 +0100
committerEric Engestrom <eric.engestrom@imgtec.com>2017-08-07 14:16:41 +0100
commit6338e452c907a5e8024b2f3615795ac68dcf0a35 (patch)
tree7b4574340e4583ee1e8d2b8b9af5a3fb1bbbc969
parentac2b806c4556c8339f5eb95578884278b1925acb (diff)
downloadlibdrm-6338e452c907a5e8024b2f3615795ac68dcf0a35.tar.gz
libdrm-6338e452c907a5e8024b2f3615795ac68dcf0a35.tar.bz2
libdrm-6338e452c907a5e8024b2f3615795ac68dcf0a35.zip
freedreno/msm: remove dead error path
`ring` cannot be non-null, so the label reduces to a simple return. Then, there is no point initialising `ring` just to overwrite it before anyone reads it. Signed-off-by: Eric Engestrom <eric@engestrom.ch> Reviewed-by: Rob Clark <robdclark@gmail.com>
-rw-r--r--freedreno/msm/msm_ringbuffer.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/freedreno/msm/msm_ringbuffer.c b/freedreno/msm/msm_ringbuffer.c
index c3b2eded..5b28feaa 100644
--- a/freedreno/msm/msm_ringbuffer.c
+++ b/freedreno/msm/msm_ringbuffer.c
@@ -589,12 +589,12 @@ drm_private struct fd_ringbuffer * msm_ringbuffer_new(struct fd_pipe *pipe,
uint32_t size)
{
struct msm_ringbuffer *msm_ring;
- struct fd_ringbuffer *ring = NULL;
+ struct fd_ringbuffer *ring;
msm_ring = calloc(1, sizeof(*msm_ring));
if (!msm_ring) {
ERROR_MSG("allocation failed");
- goto fail;
+ return NULL;
}
if (size == 0) {
@@ -614,8 +614,4 @@ drm_private struct fd_ringbuffer * msm_ringbuffer_new(struct fd_pipe *pipe,
ring_cmd_new(ring, size);
return ring;
-fail:
- if (ring)
- fd_ringbuffer_del(ring);
- return NULL;
}