From patchwork Sun Mar 2 11:35:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Rueegg X-Patchwork-Id: 3749321 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CB1CC9F35F for ; Sun, 2 Mar 2014 11:38:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 070AD20382 for ; Sun, 2 Mar 2014 11:38:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0B8B82037D for ; Sun, 2 Mar 2014 11:37:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751879AbaCBLh6 (ORCPT ); Sun, 2 Mar 2014 06:37:58 -0500 Received: from mail-ea0-f173.google.com ([209.85.215.173]:51695 "EHLO mail-ea0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751872AbaCBLh5 (ORCPT ); Sun, 2 Mar 2014 06:37:57 -0500 Received: by mail-ea0-f173.google.com with SMTP id r15so2426704ead.32 for ; Sun, 02 Mar 2014 03:37:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=5lvhWqGknCXMn5KMwYMfk+2QkQ4bnYlNLkPLKl6xhao=; b=PMN/OjlJEsEMd2Eurew0pkairlcMmGiMEfqAjCCEto2JeXJFkY5QbdDNuBQncCOhuv Qa3SdkLoTPrBv0zRC0MXqgKBkbC5x6UYUVwBwLdvYaxxJ6k+kEaUrZ4ERuRNgjh/7Cii 280LeJAr9CLXmEhK0hU3IaxReyt19rmsQ2y/+gM68mMDSo5rgbQLhyY0efMchZszWtd0 PWtmruuc20fW36+eWYSFoLmB6n7umaGRzIg3njZc9Lv6CJ+plbJ0UkJRYqdJrHYZ14x4 sjTcnPZxBDq/ws8qLS7aohf2pv3AU70WR6SHxKEUvZu7VDAbZMnKu+gSdxsL3ZH5suvK 6nhw== X-Received: by 10.15.86.11 with SMTP id h11mr33313913eez.8.1393760275598; Sun, 02 Mar 2014 03:37:55 -0800 (PST) Received: from archi7.home (140-164.194-178.cust.bluewin.ch. [178.194.164.140]) by mx.google.com with ESMTPSA id o43sm35523517eef.12.2014.03.02.03.37.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 02 Mar 2014 03:37:54 -0800 (PST) From: Felix Rueegg To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Felix Rueegg Subject: [PATCH] input: ff-memless: don't schedule already playing effect to play again Date: Sun, 2 Mar 2014 12:35:43 +0100 Message-Id: <1393760143-5986-1-git-send-email-felix.rueegg@gmail.com> X-Mailer: git-send-email 1.9.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 When an effect with zero replay length, zero replay delay and zero envelope attack length is uploaded, it is played and then scheduled to play again one timer tick later. This triggers a warning (URB submitted while active) in combination with the xpad driver. Skipping the rescheduling of this effect fixes the issue. Signed-off-by: Felix Rueegg --- drivers/input/ff-memless.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/input/ff-memless.c b/drivers/input/ff-memless.c index 74c0d8c..2e06948 100644 --- a/drivers/input/ff-memless.c +++ b/drivers/input/ff-memless.c @@ -139,10 +139,13 @@ static void ml_schedule_timer(struct ml_device *ml) if (!test_bit(FF_EFFECT_STARTED, &state->flags)) continue; - if (test_bit(FF_EFFECT_PLAYING, &state->flags)) + if (test_bit(FF_EFFECT_PLAYING, &state->flags)) { next_at = calculate_next_time(state); - else + if (next_at == now) + continue; + } else { next_at = state->play_at; + } if (time_before_eq(now, next_at) && (++events == 1 || time_before(next_at, earliest)))