From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E942C742BA for ; Fri, 12 Jul 2019 12:38:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1D8532080A for ; Fri, 12 Jul 2019 12:38:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562935135; bh=IMQot/HOMIyuIRMyLHqWT19plTn8X5tINhLp925YUBM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=eAzrJ+diPR9xb6V6HWg5afCV8ymEJLw6vZcBuAIaF+aGaY5a21KOT9QnXGcpeOuOA AE8DnXP+P+m3pYNBnRdGvHB1b4zQ5sb1orfNtyvSOFi3UppBvzJGAvx/ZhNqOrTlAd ZzHkHvob4EyaOZaOrdneO3dmNb6Rb75r9rvhJGWI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727950AbfGLM2W (ORCPT ); Fri, 12 Jul 2019 08:28:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:42076 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727530AbfGLM2U (ORCPT ); Fri, 12 Jul 2019 08:28:20 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7838F2084B; Fri, 12 Jul 2019 12:28:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562934500; bh=IMQot/HOMIyuIRMyLHqWT19plTn8X5tINhLp925YUBM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CNlok3POrOt7bskEqP1IO2XRhYnvZqoS5w4GAn45InqrUHFZQswnANVtFh78r0eFm GOeHEaEVppCi3IWJnKLL9gVvg5oshciuhs+cfVTZy5AZbBoeeiXwNg1+W1em+DOBKP mI8ioe7IAqQrcJAUP/U/CGIMAzFaA51hrLbT9QZY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Srinivas Kandagatla , Pierre-Louis Bossart , Sanyog Kale , Vinod Koul , Sasha Levin Subject: [PATCH 5.1 031/138] soundwire: stream: fix bad unlock balance Date: Fri, 12 Jul 2019 14:18:15 +0200 Message-Id: <20190712121629.888401834@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190712121628.731888964@linuxfoundation.org> References: <20190712121628.731888964@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 9315d904c7e8f38886e2820fa6cb8d0fa723ea21 ] the msg lock is taken for multi-link cases only but released unconditionally, leading to an unlock balance warning for single-link usages This patch fixes this. ===================================== WARNING: bad unlock balance detected! 5.1.0-16506-gc1c383a6f0a2-dirty #1523 Tainted: G W ------------------------------------- aplay/2954 is trying to release lock (&bus->msg_lock) at: do_bank_switch+0x21c/0x480 but there are no more locks to release! Signed-off-by: Srinivas Kandagatla Acked-by: Pierre-Louis Bossart Acked-by: Sanyog Kale [vkoul: edited the change log as suggested by Pierre] Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/soundwire/stream.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c index 00618de2ee12..794ced434cf2 100644 --- a/drivers/soundwire/stream.c +++ b/drivers/soundwire/stream.c @@ -805,7 +805,8 @@ static int do_bank_switch(struct sdw_stream_runtime *stream) goto error; } - mutex_unlock(&bus->msg_lock); + if (bus->multi_link) + mutex_unlock(&bus->msg_lock); } return ret; -- 2.20.1