From patchwork Tue Jul 25 20:45:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 108709 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp29179qge; Tue, 25 Jul 2017 13:46:17 -0700 (PDT) X-Received: by 10.98.210.70 with SMTP id c67mr20897133pfg.6.1501015577275; Tue, 25 Jul 2017 13:46:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501015577; cv=none; d=google.com; s=arc-20160816; b=ejcAPXabiBABoBUgxWOsDVEei/eu7SyuIen3+QMRiGb8pq+aJNNr175LtCzKGRdTW6 5oC06jSgTINrC1Idv1ErL520I29B8G/KWc0snE20i1CGBDTvhxP0s8xWoNO7/xBMUh5m OjQcWbx4tKhTUzAw5A+h8/49nMIns4W+s3EcpgU/R/4lsO3S1XzF74F1C8sJTJr69YrU MM0TtDBpyo1c8En8G46/lF6PBVAs0bz5BcF1rOcs+8k4nDWCwgyuIMr+yBgTRstbZxzG iBNcBRs1lVV/s/iMTDiQzGSltJrUsjJHevm2x03NmSH4Mp3VqPE4t0YWaX14e9FtDX4P iSKA== 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=efxlQ4VhcRpglOSwCdkd3arwh+pH/mw/LtxVFz42Ruo=; b=boTlUQUrudcU3+MsL2fu3QHExz+3NArgribDx3QtPEesQDDFNeGot7Tsd2hSMb87rZ tf6/iDGO1A/zIfLGbcE+UJu62w0YLIA4vVE93hrzoQF5QZAHY5V7mbWgDv+1oSJVn657 9SjcaGMqziVIUpy/AWwHt9JZJLkiK9Z+cQW1EMmu0YYvwDwn4CTrX4jJGSa5CHWO154D EFVVnrNlk2KWvFzg3fU7bsFW2YUmPvhUpDmyNZCE1Yzdijooj8VfQXeF8jbfPBJC780w 8dJzYMajlXraoXMXYl6fdQYiGVld/drZ8DOSM+qoYucDbUXm3Q8H+a5wYB62r6KPLMBh D/Yg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=RO8gl7Iy; 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 k3si387020pgk.256.2017.07.25.13.46.17; Tue, 25 Jul 2017 13:46:17 -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=RO8gl7Iy; 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 S1752654AbdGYUqP (ORCPT + 6 others); Tue, 25 Jul 2017 16:46:15 -0400 Received: from mail-pg0-f46.google.com ([74.125.83.46]:35908 "EHLO mail-pg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752433AbdGYUqN (ORCPT ); Tue, 25 Jul 2017 16:46:13 -0400 Received: by mail-pg0-f46.google.com with SMTP id 125so74836773pgi.3 for ; Tue, 25 Jul 2017 13:46:13 -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=efxlQ4VhcRpglOSwCdkd3arwh+pH/mw/LtxVFz42Ruo=; b=RO8gl7IyNNWHrCeHQvQyYZbMIQl1LrMSlwL2tzSPihZ+bKwe2SEraI5kTrVtcSKH6E kXVgodnZsWJkb6QYNR+a/hBAzUUSw8pwnrzzqAD14C4GTkIUp4vtShU9gWffoPXUZNZE Z5vdZ/L+r/xqEBT+8yhDiJI8wkLDkzJJcXFgM= 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=efxlQ4VhcRpglOSwCdkd3arwh+pH/mw/LtxVFz42Ruo=; b=fliM68Hsv5GGX/GiQkK+Xtqd6XtofkwnpnwCOdhwvR78RbRVMmsPGp6Kxp3FklNXzO JvNn5oT+qF2YDOfC/lGE8hEuWcMpW50c2z+wi4gH7RC2koojGFqu7QykjXfLGov2aiOu Y31QNQ0dCP0gPqPJMhrR7scKZucBOQ6yU8LFY8aZV3PkDDDbii+WlwoyKGaSJ73t+ABj UESSayFSVZ4hyzEuHW/TWWJ6Tq2lrwwIUhafcVwAc3FO5avkxivw2nwoKm5m3TAWldhQ vBUPgUoiaBwMwuc8jBnRI+TI1xmag+kCKhebxrPlVQRwxL0UK5H9kal85Klyy3O/y2rP 5mpA== X-Gm-Message-State: AIVw113i8WuX5lG95/+fEzFZObIKrKUuE85i/uzG9K77zpbZOLjjNZNP gYU8Btw8WcWbWdQU/S/Jyw== X-Received: by 10.84.211.110 with SMTP id b101mr17749183pli.441.1501015573123; Tue, 25 Jul 2017 13:46:13 -0700 (PDT) Received: from localhost.localdomain ([106.51.135.235]) by smtp.gmail.com with ESMTPSA id d4sm532125pfj.59.2017.07.25.13.46.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Jul 2017 13:46:12 -0700 (PDT) From: Amit Pundir To: Greg KH Cc: Stable , Sudeep Holla , Jassi Brar Subject: [PATCH for-3.18 14/15] mailbox: handle empty message in tx_tick Date: Wed, 26 Jul 2017 02:15:25 +0530 Message-Id: <1501015526-32178-15-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1501015526-32178-1-git-send-email-amit.pundir@linaro.org> References: <1501015526-32178-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 cbde6fccbc29..e464ff084e82 100644 --- a/drivers/mailbox/mailbox.c +++ b/drivers/mailbox/mailbox.c @@ -99,8 +99,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)