From patchwork Tue Jul 25 19:29:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 108675 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp939720qge; Tue, 25 Jul 2017 12:30:06 -0700 (PDT) X-Received: by 10.84.140.107 with SMTP id 98mr22034131pls.97.1501011006305; Tue, 25 Jul 2017 12:30:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501011006; cv=none; d=google.com; s=arc-20160816; b=J7rquhOFkLbhpZrwM2f0/regvny2gEQQ3MAZtcdETZcoAZe+/UmzMYxzObKJT8djBa XxfxQdCq0hMGlmg8eHLuYCxRppNokjpYge95Mr24WYG4GLAXH6b4xZyS8I+00sxJVaKG OXn4xUpaCwmD2VsWgsKFo5izHmwAa7jOc07DU7uZRJMgbJuW7jMu8mdOzI+izwFKJCNj vvspgbWpnBsB5R8ror6vkdzDPEeNseq85MVL80C2ivwbub3s5HIjKNxH4c3A59T9Xfl1 CJAY7a4SsAkR9YUyGpYks3bqTSktFODmmaRm477bloEauXWAjuRRqWsVw+NQKxDr2Wo0 qC/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=fTRvvTJLcmSZRL/os8LfNz3eHQLtzt4cjPYTnsxJ35w=; b=a240PBC6eXeagCuBWwgG5FtJrnwspxcIpbLO9kVvsSY23TnIAkgLnKMB6GwURBy1qO B4di9cqjg4x0QNZdI9lo+Anh7JvHxycoi0z84hl1kUKKpzesRm1dm27griqbAnsTB4bb 7/qWEZCegmuHAd2chDAQQ2rtv8b4XGpCK5H321OQ+132DBROjDYPUAu6YhuFJjbA9W6c iZNpxm9A24OehfaNcfRdBgS+IsHonKaAwNsxAilQq7t0UI40U4vrA0jbAzYEnJwx/pCP af7epWH/KhNT5UVrZ0lXmHN6RBhvYlje/F0u5/Ao2VZJIjqLIID+zoTDRqo8kmHU5IJ7 xRug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=OL0B1G4w; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e66si8525288pgc.135.2017.07.25.12.30.05; Tue, 25 Jul 2017 12:30:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=OL0B1G4w; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753693AbdGYTaA (ORCPT + 6 others); Tue, 25 Jul 2017 15:30:00 -0400 Received: from mail-pf0-f170.google.com ([209.85.192.170]:34971 "EHLO mail-pf0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754316AbdGYT3r (ORCPT ); Tue, 25 Jul 2017 15:29:47 -0400 Received: by mail-pf0-f170.google.com with SMTP id h29so26917332pfd.2 for ; Tue, 25 Jul 2017 12:29:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fTRvvTJLcmSZRL/os8LfNz3eHQLtzt4cjPYTnsxJ35w=; b=OL0B1G4wadnYRVN6vx3n+AfRApVlCp+5TIhj9PBWEFJO399P6muZpcPrmkMem24uNo uF4Qpa9thCs+JfG9oAJnUayl3LM25wYgWISROtvn22NpudVekUGx/AxaQ5NYOOyhdIYb XZXf3JggZVeNccWIBO9SZQu7Hlmhpc6BdA4zs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fTRvvTJLcmSZRL/os8LfNz3eHQLtzt4cjPYTnsxJ35w=; b=O96tlUgMvUsDzA+Sacw+vXKr4TX4RXZQVfGxDN1o6vt64WDAPe1yyBRV8rbgfHenYT Akrx6xsNcxKlKUuQCisLYEHgNRYwXEowBAtldte2uZa/ZTiYO15olum2aIU26jfdNOzi QT0jLChg7x9Dlo0+woagsCo1iy4kWV/xryqvgU8KZnWZdkigSR8wF2JH6M7mFRu2WNMA jIXUSa4L7GTOUNJmC6ZK3PFawQ/tVGegUrUXqx64t0Gn2sRrlmN/TejlHfgwZowQVq/u U0HHsMARDx8Lb8MUa+TWljZUTFS02LqHmgoDIDrd7Fy2oGL0pfD0KbKdKaQU0CajGeLP eeDg== X-Gm-Message-State: AIVw110N2p282lKP4hU7e9DrxqfFYCuZhjgiLwl5K5vgh6WMSTh56Isc m/NI7Eih8mAGQQke X-Received: by 10.99.44.206 with SMTP id s197mr20388034pgs.116.1501010986565; Tue, 25 Jul 2017 12:29:46 -0700 (PDT) Received: from localhost.localdomain ([106.51.135.235]) by smtp.gmail.com with ESMTPSA id 85sm30371425pfr.90.2017.07.25.12.29.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Jul 2017 12:29:45 -0700 (PDT) From: Amit Pundir To: Greg KH Cc: Stable , Sudeep Holla , Jassi Brar Subject: [PATCH for-4.9 09/10] mailbox: handle empty message in tx_tick Date: Wed, 26 Jul 2017 00:59:15 +0530 Message-Id: <1501010956-27944-10-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1501010956-27944-1-git-send-email-amit.pundir@linaro.org> References: <1501010956-27944-1-git-send-email-amit.pundir@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sudeep Holla commit cb710ab1d8a23f68ff8f45aedf3e552bb90e70de upstream. We already check if the message is empty before calling the client tx_done callback. Calling completion on a wait event is also invalid if the message is empty. This patch moves the existing empty message check earlier. Fixes: 2b6d83e2b8b7 ("mailbox: Introduce framework for mailbox") Signed-off-by: Sudeep Holla Signed-off-by: Jassi Brar Signed-off-by: Amit Pundir --- drivers/mailbox/mailbox.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c index 77ac049e51b6..87ef465c6947 100644 --- a/drivers/mailbox/mailbox.c +++ b/drivers/mailbox/mailbox.c @@ -104,8 +104,11 @@ static void tx_tick(struct mbox_chan *chan, int r) /* Submit next message */ msg_submit(chan); + if (!mssg) + return; + /* Notify the client */ - if (mssg && chan->cl->tx_done) + if (chan->cl->tx_done) chan->cl->tx_done(chan->cl, mssg, r); if (r != -ETIME && chan->cl->tx_block)