Message ID | 20200518173501.940945361@linuxfoundation.org |
---|---|
State | Superseded |
Headers | show
Return-Path: <SRS0=DMP2=7A=vger.kernel.org=stable-owner@kernel.org> 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 44D3EC433DF for <stable@archiver.kernel.org>; Mon, 18 May 2020 17:52:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2080F20849 for <stable@archiver.kernel.org>; Mon, 18 May 2020 17:52:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589824362; bh=Je14zzXCFDmRtOIvyBQvBqQRd/NXT8DHGgDIWTJdP9s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cSBEPW3xGxyodgkjM/dZ1bYPDRAiwvZr1r34Aa1y0CbUU8FGmisNd1njhnQJURF0z KVCrNnaS9LN8SZHoTIUzK9M68QgtkQlRG/9fvv43o/+qXLdN9amIGeUeuwtm86X2wT 2ozjVsdOkFHq8NYN/OVI8Qplt3OUoOGSk9TTn6yk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730520AbgERRwh (ORCPT <rfc822;stable@archiver.kernel.org>); Mon, 18 May 2020 13:52:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:55908 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731000AbgERRwf (ORCPT <rfc822;stable@vger.kernel.org>); Mon, 18 May 2020 13:52:35 -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 ADF0420674; Mon, 18 May 2020 17:52:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589824354; bh=Je14zzXCFDmRtOIvyBQvBqQRd/NXT8DHGgDIWTJdP9s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZUjqKOUi1Flt7E/GtSSyD7UZFIzdUt1V7zhtIoggRmlQu2kwLLIGn/ecy/8IeU+D8 EWtNGUt9lvrdQHKKaggSp5JJJ4JJxoWKQedNYZDPnbjYy9ae9QZCJSy94e7odd6ST2 JJrmddDQe2R+xB9H5yatweYRPYVgGNAs0Jb61cu0= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Baolin Wang <baolin.wang@linaro.org>, Peter Chen <peter.chen@nxp.com>, Li Jun <jun.li@nxp.com>, Mathias Nyman <mathias.nyman@linux.intel.com> Subject: [PATCH 4.19 57/80] usb: host: xhci-plat: keep runtime active when removing host Date: Mon, 18 May 2020 19:37:15 +0200 Message-Id: <20200518173501.940945361@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200518173450.097837707@linuxfoundation.org> References: <20200518173450.097837707@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: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -361,6 +361,7 @@ static int xhci_plat_remove(struct platf struct clk *reg_clk = xhci->reg_clk; struct usb_hcd *shared_hcd = xhci->shared_hcd; + pm_runtime_get_sync(&dev->dev); xhci->xhc_state |= XHCI_STATE_REMOVING; usb_remove_hcd(shared_hcd); @@ -374,8 +375,9 @@ static int xhci_plat_remove(struct platf clk_disable_unprepare(reg_clk); usb_put_hcd(hcd); - pm_runtime_set_suspended(&dev->dev); pm_runtime_disable(&dev->dev); + pm_runtime_put_noidle(&dev->dev); + pm_runtime_set_suspended(&dev->dev); return 0; }