diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-09-28 20:44:52 +0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-09-28 20:44:52 +0200 |
| commit | 717d182e4173c037fb9e720a046dec804fd9990e (patch) | |
| tree | 51f14a932abcbbb17c3eb023c63179e2843982d7 /drivers/net/ethernet/sfc/ef100.c | |
| parent | perf test: Fix msan uninitialized use. (diff) | |
| parent | Merge tag 'nfs-for-5.9-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (diff) | |
| download | linux-717d182e4173c037fb9e720a046dec804fd9990e.tar.xz linux-717d182e4173c037fb9e720a046dec804fd9990e.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes and get v5.10 development in sync with the main kernel
sources.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/net/ethernet/sfc/ef100.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/ef100.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/sfc/ef100.c b/drivers/net/ethernet/sfc/ef100.c index c54b7f8243f3..ffdb36715a49 100644 --- a/drivers/net/ethernet/sfc/ef100.c +++ b/drivers/net/ethernet/sfc/ef100.c @@ -490,6 +490,7 @@ static int ef100_pci_probe(struct pci_dev *pci_dev, if (fcw.offset > pci_resource_len(efx->pci_dev, fcw.bar) - ESE_GZ_FCW_LEN) { netif_err(efx, probe, efx->net_dev, "Func control window overruns BAR\n"); + rc = -EIO; goto fail; } |