diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-03-07 21:19:05 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-03-07 21:29:36 +0300 |
| commit | e3afe5dd3abea43e056a004df02fb49f24cc5ad7 (patch) | |
| tree | a8f38510fe1aeee32a54112fdee27e1948cde35e /drivers/net/usb | |
| parent | a148f82c457f957cdc9445101882c225aa8c3ff0 (diff) | |
| parent | df4793505abd5df399bc6d9a4d8fe81761f557cd (diff) | |
| download | linux-e3afe5dd3abea43e056a004df02fb49f24cc5ad7.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts.
Adjacent changes:
net/core/page_pool_user.c
0b11b1c5c320 ("netdev: let netlink core handle -EMSGSIZE errors")
429679dcf7d9 ("page_pool: fix netlink dump stop/resume")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/lan78xx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index 3ff430198512..80ee4fcdfb36 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -3135,7 +3135,8 @@ static int lan78xx_open(struct net_device *net) done: mutex_unlock(&dev->dev_mutex); - usb_autopm_put_interface(dev->intf); + if (ret < 0) + usb_autopm_put_interface(dev->intf); return ret; } |