From patchwork Tue Jul 14 14:10:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 6787541 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C241CC05AC for ; Tue, 14 Jul 2015 14:06:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 074DF20712 for ; Tue, 14 Jul 2015 14:06:10 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 1F8F62055D for ; Tue, 14 Jul 2015 14:06:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7F8A36EA2C; Tue, 14 Jul 2015 07:06:07 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTPS id C30506EA24 for ; Tue, 14 Jul 2015 07:06:03 -0700 (PDT) Received: by wiga1 with SMTP id a1so100612312wig.0 for ; Tue, 14 Jul 2015 07:06:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6qZu0WwT+/CJdyaZs+LKwDWVYGytUOerCwETHMRLmGw=; b=MYONktm7cumAu4WEOuVEEJRy4vSmfQJxOdMYc+n4O/9rcrcjddL3rOt4ad2RhxWIXP bvwWEGFckdvcknHGZX2FczPVrjCMqZm8Mf1m3leSHLfbQOrZpPhnxX9qSKP3Tgx/Ud5N WgUU+/gUVJi++rZgIA8rnLi8AQR9CZILeX5OUkJR/mzmjrxp/wAlRujDmzdTQ0p4H12Z vv7wPVBTnM3Nc0Y5GafMJHi1isidCb0GpanxXKw8/BYJWCc50faU817iXzu+BatSQ1pN y7blUnM9FUtEOO1S8Two1HgFqx6jY2loAhyvG2WSA03EdxeQL6CzxuOKVMlZqQm+i5Sr Z8oA== X-Received: by 10.180.96.170 with SMTP id dt10mr34068732wib.42.1436882762235; Tue, 14 Jul 2015 07:06:02 -0700 (PDT) Received: from arch-x220.localdomain (cpc12-croy20-2-0-cust52.croy.cable.virginm.net. [82.44.54.53]) by smtp.gmail.com with ESMTPSA id fb3sm20979888wib.21.2015.07.14.07.06.00 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Jul 2015 07:06:01 -0700 (PDT) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm 2/4] omap: zero is a valid fd number, treat it as such Date: Tue, 14 Jul 2015 15:10:03 +0100 Message-Id: <1436883005-6163-2-git-send-email-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.4.5 In-Reply-To: <1436883005-6163-1-git-send-email-emil.l.velikov@gmail.com> References: <1436883005-6163-1-git-send-email-emil.l.velikov@gmail.com> Cc: emil.l.velikov@gmail.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Equivalent to the previous patch. Cc: Rob Clark Cc: Thierry Reding Suggested-by: Thierry Reding Signed-off-by: Emil Velikov Reviewed-by: Thierry Reding --- omap/omap_drm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omap/omap_drm.c b/omap/omap_drm.c index ff83a93..4a0248d 100644 --- a/omap/omap_drm.c +++ b/omap/omap_drm.c @@ -363,7 +363,7 @@ void omap_bo_del(struct omap_bo *bo) munmap(bo->map, bo->size); } - if (bo->fd) { + if (bo->fd >= 0) { close(bo->fd); } @@ -414,7 +414,7 @@ uint32_t omap_bo_handle(struct omap_bo *bo) */ int omap_bo_dmabuf(struct omap_bo *bo) { - if (!bo->fd) { + if (bo->fd < 0) { struct drm_prime_handle req = { .handle = bo->handle, .flags = DRM_CLOEXEC,