From: Hans de Goede Subject: [PATCH 1/2] intel_device: Don't close the fd on probe failure if it is server managed Date: Tue, 18 Mar 2014 15:16:30 +0100 Message-ID: <1395152191-19258-1-git-send-email-hdegoede@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTP id 055BB8D768 for ; Tue, 18 Mar 2014 07:16:46 -0700 (PDT) Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s2IEGYDP023141 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 18 Mar 2014 10:16:35 -0400 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: peter.hutterer@redhat.com List-Id: intel-gfx@lists.freedesktop.org I hit this corner case when testing a single X server spanning both intel gfx + an usb display link adapter driven by xf86-video-modesetting. In this scenario the intel driver gets its platformProbe method called first, and if it then closes the server managed fd, the xf86-video-modesetting gets EBADFD errors. Signed-off-by: Hans de Goede --- src/intel_device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/intel_device.c b/src/intel_device.c index c0e1582..2d31ec8 100644 --- a/src/intel_device.c +++ b/src/intel_device.c @@ -339,7 +339,8 @@ int intel_open_device(int entity_num, return fd; err_close: - close(fd); + if (master_count == 0) /* Don't close server-fds */ + close(fd); err_path: free(local_path); return -1; -- 1.9.0