Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761823AbcKDN0X (ORCPT ); Fri, 4 Nov 2016 09:26:23 -0400 Received: from netrider.rowland.org ([192.131.102.5]:43783 "HELO netrider.rowland.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1754116AbcKDN0V (ORCPT ); Fri, 4 Nov 2016 09:26:21 -0400 Date: Fri, 4 Nov 2016 09:26:20 -0400 (EDT) From: Alan Stern X-X-Sender: stern@netrider.rowland.org To: Kai-Heng Feng cc: oneukum@suse.com, , , Subject: Re: [PATCH] usbnet: prevent device rpm suspend in usbnet_probe function In-Reply-To: <20161104095735.21071-1-kai.heng.feng@canonical.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1629 Lines: 48 On Fri, 4 Nov 2016, Kai-Heng Feng wrote: > Sometimes cdc_mbim failed to probe if runtime pm is enabled: > [ 9.305626] cdc_mbim: probe of 2-2:1.12 failed with error -22 > > This can be solved by increase its pm usage counter. This should not be needed. The USB core increments the PM usage counter of a device before probing its interfaces. Alan Stern > Signed-off-by: Kai-Heng Feng > --- > drivers/net/usb/usbnet.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c > index d5071e3..f77b4bf 100644 > --- a/drivers/net/usb/usbnet.c > +++ b/drivers/net/usb/usbnet.c > @@ -1674,12 +1674,15 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) > net->watchdog_timeo = TX_TIMEOUT_JIFFIES; > net->ethtool_ops = &usbnet_ethtool_ops; > > + if (usb_autopm_get_interface(dev->intf) < 0) > + goto out1; > + > // allow device-specific bind/init procedures > // NOTE net->name still not usable ... > if (info->bind) { > status = info->bind (dev, udev); > if (status < 0) > - goto out1; > + goto out2; > > // heuristic: "usb%d" for links we know are two-host, > // else "eth%d" when there's reasonable doubt. userspace > @@ -1772,6 +1775,8 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) > out3: > if (info->unbind) > info->unbind (dev, udev); > +out2: > + usb_autopm_put_interface(dev->intf); > out1: > /* subdrivers must undo all they did in bind() if they > * fail it, but we may fail later and a deferred kevent >