Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760757AbcKDJ6D (ORCPT ); Fri, 4 Nov 2016 05:58:03 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:53686 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752964AbcKDJ6B (ORCPT ); Fri, 4 Nov 2016 05:58:01 -0400 From: Kai-Heng Feng To: oneukum@suse.com Cc: netdev@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Kai-Heng Feng Subject: [PATCH] usbnet: prevent device rpm suspend in usbnet_probe function Date: Fri, 4 Nov 2016 17:57:35 +0800 Message-Id: <20161104095735.21071-1-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.9.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1386 Lines: 42 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. 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 -- 2.7.4