sna/gen8: Fix cleanup after failing to convert channel
authorChris Wilson <chris@chris-wilson.co.uk>
Wed, 18 Jun 2014 13:48:33 +0000 (14:48 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Wed, 18 Jun 2014 13:52:45 +0000 (14:52 +0100)
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
src/sna/gen8_render.c

index 26a3579..7fd37c1 100644 (file)
@@ -2306,7 +2306,7 @@ gen8_render_composite(struct sna *sna,
                        return true;
 
                if (!gen8_composite_channel_convert(&tmp->src))
-                       goto cleanup_dst;
+                       goto cleanup_src;
 
                break;
        }
@@ -2353,7 +2353,7 @@ gen8_render_composite(struct sna *sna,
                                /* fall through to fixup */
                        case 1:
                                if (!gen8_composite_channel_convert(&tmp->mask))
-                                       goto cleanup_src;
+                                       goto cleanup_mask;
                                break;
                        }
                }
@@ -2588,7 +2588,7 @@ gen8_render_composite_spans(struct sna *sna,
                /* fall through to fixup */
        case 1:
                if (!gen8_composite_channel_convert(&tmp->base.src))
-                       goto cleanup_dst;
+                       goto cleanup_src;
                break;
        }
        tmp->base.mask.bo = NULL;