From ae460046edd80f0262586850f95017b332ba85a5 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Thu, 14 Dec 2017 20:38:58 +0100 Subject: [PATCH] monitor-manager-kms: Fix recently introduced build issue The recent commit 6dd28bd2c7e0c "poll() on KMS fd on EAGAIN" backported error handling code that does not apply to the gnome-3-26 branch. https://bugzilla.gnome.org/show_bug.cgi?id=791024 --- src/backends/native/meta-monitor-manager-kms.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/backends/native/meta-monitor-manager-kms.c b/src/backends/native/meta-monitor-manager-kms.c index 32a8aa67c..24d01daaa 100644 --- a/src/backends/native/meta-monitor-manager-kms.c +++ b/src/backends/native/meta-monitor-manager-kms.c @@ -1792,11 +1792,7 @@ meta_monitor_manager_kms_wait_for_flip (MetaMonitorManagerKms *manager_kms) int ret; if (errno != EAGAIN) - { - g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, - strerror (errno)); - return; - } + return; pfd.fd = manager_kms->fd; pfd.events = POLL_IN | POLL_ERR;