From patchwork Fri Mar 1 00:43:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 15185 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id C8F7223E1A for ; Fri, 1 Mar 2013 00:44:27 +0000 (UTC) Received: from mail-vb0-f47.google.com (mail-vb0-f47.google.com [209.85.212.47]) by fiordland.canonical.com (Postfix) with ESMTP id 63273A195A1 for ; Fri, 1 Mar 2013 00:44:27 +0000 (UTC) Received: by mail-vb0-f47.google.com with SMTP id e21so271412vbm.20 for ; Thu, 28 Feb 2013 16:44:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=OoiG9IXOG2dt+p8T6Af3Cw8Co2JOp8BFq3WVBecj9Fs=; b=ZbB1SuaZPzEt9I0ZpIFK0jlgZk+MlECjykRaDLePgPYze6qGaR8y7RgpGfKYXPLZdQ bNOI9x/7ZfEC0UomMFjTgoFBRem66uIQ6iDRamGWTLasdoAbk6ETbVaU0YAtaThvhRaJ +jDNTEc2oAHhaJ0Mty/4kXE/kfoCw/GjiA09exYOhoI56Kw9vXdSx1jliwYyvUuz1cqF +hMd1vLDTbKNob7PFDnVvHauo6OXVsuBqMCswpOC50k3GVXFXmNqz0EWnLKoCB6I1a6D Xsz8PELWHUApzPtnBtuMWfaB5UmnObb7/olIisbLpKfqpX8BKhHYBvu6J2g5x5qndfZJ xzRg== X-Received: by 10.220.242.73 with SMTP id lh9mr3249795vcb.49.1362098666923; Thu, 28 Feb 2013 16:44:26 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.145.101 with SMTP id st5csp677veb; Thu, 28 Feb 2013 16:44:26 -0800 (PST) X-Received: by 10.67.2.5 with SMTP id bk5mr15916002pad.126.1362098666024; Thu, 28 Feb 2013 16:44:26 -0800 (PST) Received: from mail-da0-f53.google.com (mail-da0-f53.google.com [209.85.210.53]) by mx.google.com with ESMTPS id n6si10604245paw.284.2013.02.28.16.44.25 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Feb 2013 16:44:26 -0800 (PST) Received-SPF: neutral (google.com: 209.85.210.53 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=209.85.210.53; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.53 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) smtp.mail=john.stultz@linaro.org Received: by mail-da0-f53.google.com with SMTP id n34so1099817dal.40 for ; Thu, 28 Feb 2013 16:44:25 -0800 (PST) X-Received: by 10.66.191.162 with SMTP id gz2mr15930067pac.206.1362098665651; Thu, 28 Feb 2013 16:44:25 -0800 (PST) Received: from localhost.localdomain (c-24-21-54-107.hsd1.or.comcast.net. [24.21.54.107]) by mx.google.com with ESMTPS id dx17sm10914892pac.17.2013.02.28.16.44.24 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Feb 2013 16:44:24 -0800 (PST) From: John Stultz To: lkml Cc: Erik Gilling , Maarten Lankhorst , Daniel Vetter , Rob Clark , Sumit Semwal , Greg KH , dri-devel@lists.freedesktop.org, Android Kernel Team , John Stultz Subject: [PATCH 29/30] staging: sync: Don't log wait timeouts when timeout = 0 Date: Thu, 28 Feb 2013 16:43:25 -0800 Message-Id: <1362098606-26469-30-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1362098606-26469-1-git-send-email-john.stultz@linaro.org> References: <1362098606-26469-1-git-send-email-john.stultz@linaro.org> X-Gm-Message-State: ALoCoQk8lRJ8qjs6DESmMUKfiXZjOS3U8Oi/LMb21QthpX8sDPCT2XHeo/NMtL2BAF4JrM3u7Q1n From: Erik Gilling If the timeout is zero, don't trip the timeout debugging Cc: Maarten Lankhorst Cc: Erik Gilling Cc: Daniel Vetter Cc: Rob Clark Cc: Sumit Semwal Cc: Greg KH Cc: dri-devel@lists.freedesktop.org Cc: Android Kernel Team Signed-off-by: Erik Gilling [jstultz: Added commit message] Signed-off-by: John Stultz --- drivers/staging/android/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index bd18c75..9b8b0e9 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -616,7 +616,7 @@ int sync_fence_wait(struct sync_fence *fence, long timeout) return fence->status; } - if (fence->status == 0) { + if (fence->status == 0 && timeout > 0) { pr_info("fence timeout on [%p] after %dms\n", fence, jiffies_to_msecs(timeout)); sync_dump();