diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-11-27 09:23:49 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-11-27 09:23:49 +0000 |
| commit | 3396b3372e61f8b579395e32c53212612b14daff (patch) | |
| tree | 6e863b97cc8eb2e0f52d02b0520720ea443b6d58 /drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | |
| parent | 6acba0345b68772830582ca1ca369a2f45631275 (diff) | |
| parent | 2cc14f52aeb78ce3f29677c2de1f06c0e91471ab (diff) | |
| download | linux-3396b3372e61f8b579395e32c53212612b14daff.tar.gz linux-3396b3372e61f8b579395e32c53212612b14daff.tar.bz2 linux-3396b3372e61f8b579395e32c53212612b14daff.zip | |
Merge 6.7-rc3 into usb-next
We need the USB/PHY/Thunderbolt fixes in here as well for later patches
to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/wangxun/ngbe/ngbe_main.c')
| -rw-r--r-- | drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c index 3d43f808c86b..8db804543e66 100644 --- a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c +++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c @@ -121,10 +121,8 @@ static int ngbe_sw_init(struct wx *wx) /* PCI config space info */ err = wx_sw_init(wx); - if (err < 0) { - wx_err(wx, "read of internal subsystem device id failed\n"); + if (err < 0) return err; - } /* mac type, phy type , oem type */ ngbe_init_type_code(wx); |