diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
index 38911763..e4d06806 100644
--- a/libweston/compositor-drm.c
+++ b/libweston/compositor-drm.c
@@ -6405,7 +6405,7 @@ find_primary_gpu(struct drm_backend *b, const char *seat)
 
 	e = udev_enumerate_new(b->udev);
 	udev_enumerate_add_match_subsystem(e, "drm");
-	udev_enumerate_add_match_sysname(e, "card[0-9]*");
+	udev_enumerate_add_match_sysname(e, "card0");
 
 	udev_enumerate_scan_devices(e);
 	drm_device = NULL;
@@ -6786,7 +6786,6 @@ drm_backend_create(struct weston_compositor *compositor,
 			    compositor, b->udev, seat_id,
 			    config->configure_device) < 0) {
 		weston_log("failed to create input devices\n");
-		goto err_sprite;
 	}
 
 	if (drm_backend_create_heads(b, drm_device) < 0) {