From patchwork Tue Sep 29 10:57:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 290947 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=-13.5 required=3.0 tests=BAYES_00,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 AB55DC4727F for ; Tue, 29 Sep 2020 12:08:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 628DE206CD for ; Tue, 29 Sep 2020 12:08:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601381318; bh=TJqsiAM/hFr9HnL8UDamF+XdU6EhqsF4svPBJEguVd0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Sm9lL0WpYXB3sc+Fz40CSeAZpMtNVjlRqOxzbfEcCtN9RlbEPtwZot0heGpB0WOlu XQrnBxAyVlAlu56jtSS0/J5p7UWEGFaSZq4uLj7LoWVe7EPvb9uwMr11kX4dPn/Dhr pOAL5rJLDqEUI+WBqKh8umAC9dp3AVhUMMu0Ga6U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730104AbgI2MIh (ORCPT ); Tue, 29 Sep 2020 08:08:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:56994 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730232AbgI2Lhg (ORCPT ); Tue, 29 Sep 2020 07:37:36 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 823E523B5D; Tue, 29 Sep 2020 11:36:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601379377; bh=TJqsiAM/hFr9HnL8UDamF+XdU6EhqsF4svPBJEguVd0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rPur0TyP96P+aMbRzf4njpNJMDsmK95C2QGj20Di/yhzQimV2QZr3Z0aOImSO2FVa rfmNMV/H+eI2XuNS3tiNC/Cc4ejcjvCCodLeaCnuf5idQ6eVIGSBOUVxvkDgmwgT8H C9VVGJ9A9PKMVFtPXq9BXhWNV8nJvcHsTQwt+4Bk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pierre-Louis Bossart , Vinod Koul , Sasha Levin Subject: [PATCH 5.4 136/388] soundwire: bus: disable pm_runtime in sdw_slave_delete Date: Tue, 29 Sep 2020 12:57:47 +0200 Message-Id: <20200929110017.058597177@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929110010.467764689@linuxfoundation.org> References: <20200929110010.467764689@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Pierre-Louis Bossart [ Upstream commit dff70572e9a3a1a01d9dbc2279faa784d95f41b6 ] Before removing the slave device, disable pm_runtime to prevent any race condition with the resume being executed after the bus and slave devices are removed. Since this pm_runtime_disable() is handled in common routines, implementations of Slave drivers do not need to call it in their .remove() routine. Signed-off-by: Pierre-Louis Bossart Link: https://lore.kernel.org/r/20200115000844.14695-8-pierre-louis.bossart@linux.intel.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/soundwire/bus.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c index fc53dbe57f854..a90963812357c 100644 --- a/drivers/soundwire/bus.c +++ b/drivers/soundwire/bus.c @@ -113,6 +113,8 @@ static int sdw_delete_slave(struct device *dev, void *data) struct sdw_slave *slave = dev_to_sdw_dev(dev); struct sdw_bus *bus = slave->bus; + pm_runtime_disable(dev); + sdw_slave_debugfs_exit(slave); mutex_lock(&bus->bus_lock);