diff options
Diffstat (limited to 'tests/kms/libkms-test-device.c')
-rw-r--r-- | tests/kms/libkms-test-device.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/kms/libkms-test-device.c b/tests/kms/libkms-test-device.c index 53c7349b..d3bb11ce 100644 --- a/tests/kms/libkms-test-device.c +++ b/tests/kms/libkms-test-device.c | |||
@@ -21,10 +21,6 @@ | |||
21 | * IN THE SOFTWARE. | 21 | * IN THE SOFTWARE. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #ifdef HAVE_CONFIG_H | ||
25 | #include "config.h" | ||
26 | #endif | ||
27 | |||
28 | #include <stdio.h> | 24 | #include <stdio.h> |
29 | #include <string.h> | 25 | #include <string.h> |
30 | #include <unistd.h> | 26 | #include <unistd.h> |
@@ -67,7 +63,7 @@ static void kms_device_probe_screens(struct kms_device *device) | |||
67 | 63 | ||
68 | device->screens = calloc(res->count_connectors, sizeof(screen)); | 64 | device->screens = calloc(res->count_connectors, sizeof(screen)); |
69 | if (!device->screens) | 65 | if (!device->screens) |
70 | return; | 66 | goto err_free_resources; |
71 | 67 | ||
72 | for (i = 0; i < res->count_connectors; i++) { | 68 | for (i = 0; i < res->count_connectors; i++) { |
73 | unsigned int *count; | 69 | unsigned int *count; |
@@ -97,6 +93,7 @@ static void kms_device_probe_screens(struct kms_device *device) | |||
97 | device->num_screens++; | 93 | device->num_screens++; |
98 | } | 94 | } |
99 | 95 | ||
96 | err_free_resources: | ||
100 | drmModeFreeResources(res); | 97 | drmModeFreeResources(res); |
101 | } | 98 | } |
102 | 99 | ||
@@ -112,7 +109,7 @@ static void kms_device_probe_crtcs(struct kms_device *device) | |||
112 | 109 | ||
113 | device->crtcs = calloc(res->count_crtcs, sizeof(crtc)); | 110 | device->crtcs = calloc(res->count_crtcs, sizeof(crtc)); |
114 | if (!device->crtcs) | 111 | if (!device->crtcs) |
115 | return; | 112 | goto err_free_resources; |
116 | 113 | ||
117 | for (i = 0; i < res->count_crtcs; i++) { | 114 | for (i = 0; i < res->count_crtcs; i++) { |
118 | crtc = kms_crtc_create(device, res->crtcs[i]); | 115 | crtc = kms_crtc_create(device, res->crtcs[i]); |
@@ -123,6 +120,7 @@ static void kms_device_probe_crtcs(struct kms_device *device) | |||
123 | device->num_crtcs++; | 120 | device->num_crtcs++; |
124 | } | 121 | } |
125 | 122 | ||
123 | err_free_resources: | ||
126 | drmModeFreeResources(res); | 124 | drmModeFreeResources(res); |
127 | } | 125 | } |
128 | 126 | ||
@@ -138,7 +136,7 @@ static void kms_device_probe_planes(struct kms_device *device) | |||
138 | 136 | ||
139 | device->planes = calloc(res->count_planes, sizeof(plane)); | 137 | device->planes = calloc(res->count_planes, sizeof(plane)); |
140 | if (!device->planes) | 138 | if (!device->planes) |
141 | return; | 139 | goto err_free_resources; |
142 | 140 | ||
143 | for (i = 0; i < res->count_planes; i++) { | 141 | for (i = 0; i < res->count_planes; i++) { |
144 | plane = kms_plane_create(device, res->planes[i]); | 142 | plane = kms_plane_create(device, res->planes[i]); |
@@ -149,6 +147,7 @@ static void kms_device_probe_planes(struct kms_device *device) | |||
149 | device->num_planes++; | 147 | device->num_planes++; |
150 | } | 148 | } |
151 | 149 | ||
150 | err_free_resources: | ||
152 | drmModeFreePlaneResources(res); | 151 | drmModeFreePlaneResources(res); |
153 | } | 152 | } |
154 | 153 | ||