From: Hayes Wang <hayeswang@realtek.com>
To: <netdev@vger.kernel.org>
Cc: <nic_swsd@realtek.com>, <linux-kernel@vger.kernel.org>,
<linux-usb@vger.kernel.org>, Hayes Wang <hayeswang@realtek.com>
Subject: [PATCH net-next v2 1/3] r8152: autoresume before setting feature
Date: Thu, 9 Oct 2014 18:00:24 +0800 [thread overview]
Message-ID: <1394712342-15778-61-Taiwan-albertk@realtek.com> (raw)
In-Reply-To: <1394712342-15778-60-Taiwan-albertk@realtek.com>
Resume the device before setting the feature.
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
---
drivers/net/usb/r8152.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 5cfd414..c5afe8c 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -2145,6 +2145,11 @@ static int rtl8152_set_features(struct net_device *dev,
{
netdev_features_t changed = features ^ dev->features;
struct r8152 *tp = netdev_priv(dev);
+ int ret;
+
+ ret = usb_autopm_get_interface(tp->intf);
+ if (ret < 0)
+ goto out;
if (changed & NETIF_F_HW_VLAN_CTAG_RX) {
if (features & NETIF_F_HW_VLAN_CTAG_RX)
@@ -2153,7 +2158,10 @@ static int rtl8152_set_features(struct net_device *dev,
rtl_rx_vlan_en(tp, false);
}
- return 0;
+ usb_autopm_put_interface(tp->intf);
+
+out:
+ return ret;
}
#define WAKE_ANY (WAKE_PHY | WAKE_MAGIC | WAKE_UCAST | WAKE_BCAST | WAKE_MCAST)
--
1.9.3
next prev parent reply other threads:[~2014-10-09 10:01 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-07 5:36 [PATCH net-next] r8152: use mutex for hw settings Hayes Wang
2014-10-08 19:45 ` David Miller
2014-10-09 7:59 ` Hayes Wang
2014-10-09 23:05 ` David Miller
2014-10-09 6:24 ` [PATCH net-next] r8152: add rtnl_lock Hayes Wang
2014-10-09 7:59 ` Hayes Wang
2014-10-09 10:00 ` [PATCH net-next v2 0/3] r8152: use mutex for hw settings Hayes Wang
2014-10-09 10:00 ` Hayes Wang [this message]
2014-10-09 10:00 ` [PATCH net-next v2 2/3] r8152: adjust usb_autopm_xxx Hayes Wang
2014-10-09 10:00 ` [PATCH net-next v2 3/3] r8152: add mutex for hw settings Hayes Wang
2014-10-09 23:06 ` [PATCH net-next v2 0/3] r8152: use " David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1394712342-15778-61-Taiwan-albertk@realtek.com \
--to=hayeswang@realtek.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nic_swsd@realtek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®