From patchwork Mon Nov 2 11:48:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Wood X-Patchwork-Id: 7535911 Return-Path: X-Original-To: patchwork-intel-gfx@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 7A78BBEEA4 for ; Mon, 2 Nov 2015 11:59:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BA710205BE for ; Mon, 2 Nov 2015 11:59:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E72CC20591 for ; Mon, 2 Nov 2015 11:59:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F2FE56E52A; Mon, 2 Nov 2015 03:59:41 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id CB22E6E529 for ; Mon, 2 Nov 2015 03:59:32 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP; 02 Nov 2015 03:59:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,234,1444719600"; d="scan'208";a="840558564" Received: from otc-vmt1.isw.intel.com ([10.237.224.80]) by orsmga002.jf.intel.com with ESMTP; 02 Nov 2015 03:59:08 -0800 From: Thomas Wood To: intel-gfx@lists.freedesktop.org Date: Mon, 2 Nov 2015 11:48:42 +0000 Message-Id: <1446464924-20878-6-git-send-email-thomas.wood@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1446464924-20878-1-git-send-email-thomas.wood@intel.com> References: <1446464924-20878-1-git-send-email-thomas.wood@intel.com> Organization: Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ Subject: [Intel-gfx] [PATCH i-g-t 6/8] Fix comparison of unsigned integers X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, 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 Signed-off-by: Thomas Wood --- benchmarks/gem_exec_reloc.c | 2 -- overlay/gem-interrupts.c | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/benchmarks/gem_exec_reloc.c b/benchmarks/gem_exec_reloc.c index 5be482a..2ef6df5 100644 --- a/benchmarks/gem_exec_reloc.c +++ b/benchmarks/gem_exec_reloc.c @@ -249,8 +249,6 @@ int main(int argc, char **argv) case 'r': num_relocs = atoi(optarg); - if (num_relocs < 0) - num_relocs = 0; break; } } diff --git a/overlay/gem-interrupts.c b/overlay/gem-interrupts.c index 48a36b8..0150a1d 100644 --- a/overlay/gem-interrupts.c +++ b/overlay/gem-interrupts.c @@ -142,9 +142,12 @@ int gem_interrupts_update(struct gem_interrupts *irqs) return irqs->error; if (irqs->fd < 0) { - val = interrupts_read(); - if (val < 0) + long long ret; + ret = interrupts_read(); + if (ret < 0) return irqs->error = ENODEV; + else + val = ret; } else { if (read(irqs->fd, &val, sizeof(val)) < 0) return irqs->error = errno;