Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp235847ybg; Thu, 17 Oct 2019 22:07:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqxpujsu86fk+OSIDFK2qNxf5oZVHb4svHDxZakECwHPc3ZUDbVQms4YjmQHMtDsbGRpUl6N X-Received: by 2002:a17:906:11d8:: with SMTP id o24mr7008303eja.224.1571375242711; Thu, 17 Oct 2019 22:07:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571375242; cv=none; d=google.com; s=arc-20160816; b=yk7fm7vrPg6orLCxnNFbMBFXmFoCee8BSajFVZOtXakBSzGkLi470ibrHvSf05rOXx gh7Plc3lbWV5WnyYsnrL1tZBS1atH4cFrnegiN08zgmjQkDzGUu1DSwAb8VuedK8rwsu n2cPsEfD1Kjm5nmVbq2fM6GncW/RjHLDSKHiXC+MWs5EJBTTXa5cykQmaoNI9H/0ClUR mHdydJtnnxlXOt5HgMJa3etJe9Pe8lFQ9fePv6hR2pQ9Svt5ipPgTq2cwaVaBNbl03yv 6z/U7G909SWSfMnFr4hzA5jjir+CZ2QdAIfo9fXoLglZmLc7BW77Ya0GiqTCQQ86pqhH KmUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DqaR2NS/OKWMC3C7UGsBJHQePlTu91x3u+65Spd/Cgs=; b=I0JcNM8OKD2g0cBQQBDFX18Z2IwyrD3jzwxVpKnvBaxuVsNsY0syJyxV7wlUaf+BqS roB/IzuO7XHNv4yn9xoYNyHnSJsFW/Ffo88SIF/5dhn3AmVaeePHM2eWytIB2P5Zzq3W eWfjz6HJdNiLvbXoEsLOFyydUFb6lLUHt3leDJgs4+LdQT8IwWbWS+hb1gVwfAUINJXp XGWKOt9lUfAbYX1HajSn6vvU29ccxxuCmib/Y2Cr1sgGba4zNsTfyx2f0pXeiifSfsV0 kwSk9IS5C0xeuOJyV20jYjbiFAIzjSRRyTAFc+jWqGyR/of9+o/+jfoAc8NiSZ+3+tCW jcng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ufPB6pT4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p39si3183153eda.416.2019.10.17.22.06.59; Thu, 17 Oct 2019 22:07:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=@kernel.org header.s=default header.b=ufPB6pT4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407651AbfJPWWi (ORCPT + 99 others); Wed, 16 Oct 2019 18:22:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:41888 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2394828AbfJPVxN (ORCPT ); Wed, 16 Oct 2019 17:53:13 -0400 Received: from localhost (unknown [192.55.54.58]) (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 9551421A49; Wed, 16 Oct 2019 21:53:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262792; bh=fpLQ2Tqn5ClQrR5wKEzBdrBg43SvOeIDj3WgCJAtVGQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ufPB6pT4V36GJlAuYlyzA8bddK+9lvZf/pgcxHYU9dbGUdA7CJkriAPbhog6pjPoL rDmw3dUT51YPjd1CT4kyyjD0eEqWqmPCkUpBMPU22sCdFxb0mmC+C2cdWklFzm3i+0 PXMaueDhE284nl3/43mT7SBfcXZVXnHj7lZgjh6Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold Subject: [PATCH 4.4 32/79] USB: usb-skeleton: fix runtime PM after driver unbind Date: Wed, 16 Oct 2019 14:50:07 -0700 Message-Id: <20191016214757.562734008@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214729.758892904@linuxfoundation.org> References: <20191016214729.758892904@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johan Hovold commit 5c290a5e42c3387e82de86965784d30e6c5270fd upstream. Since commit c2b71462d294 ("USB: core: Fix bug caused by duplicate interface PM usage counter") USB drivers must always balance their runtime PM gets and puts, including when the driver has already been unbound from the interface. Leaving the interface with a positive PM usage counter would prevent a later bound driver from suspending the device. Fixes: c2b71462d294 ("USB: core: Fix bug caused by duplicate interface PM usage counter") Cc: stable Signed-off-by: Johan Hovold Link: https://lore.kernel.org/r/20191001084908.2003-2-johan@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/usb/usb-skeleton.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) --- a/drivers/usb/usb-skeleton.c +++ b/drivers/usb/usb-skeleton.c @@ -75,6 +75,7 @@ static void skel_delete(struct kref *kre struct usb_skel *dev = to_skel_dev(kref); usb_free_urb(dev->bulk_in_urb); + usb_put_intf(dev->interface); usb_put_dev(dev->udev); kfree(dev->bulk_in_buffer); kfree(dev); @@ -126,10 +127,7 @@ static int skel_release(struct inode *in return -ENODEV; /* allow the device to be autosuspended */ - mutex_lock(&dev->io_mutex); - if (dev->interface) - usb_autopm_put_interface(dev->interface); - mutex_unlock(&dev->io_mutex); + usb_autopm_put_interface(dev->interface); /* decrement the count on our device */ kref_put(&dev->kref, skel_delete); @@ -511,7 +509,7 @@ static int skel_probe(struct usb_interfa init_waitqueue_head(&dev->bulk_in_wait); dev->udev = usb_get_dev(interface_to_usbdev(interface)); - dev->interface = interface; + dev->interface = usb_get_intf(interface); /* set up the endpoint information */ /* use only the first bulk-in and bulk-out endpoints */