diff options
| author | David S. Miller <davem@davemloft.net> | 2019-09-17 23:51:10 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-09-17 23:51:10 +0200 |
| commit | 1bab8d4c488be22d57f9dd09968c90a0ddc413bf (patch) | |
| tree | 81318cd13170a3b6b72489f63e92adb0eaf49693 /net/dsa/dsa2.c | |
| parent | 990925fad5c227269c3fcb76c7c46811b1e86c73 (diff) | |
| parent | 00b368502d18f790ab715e055869fd4bb7484a9b (diff) | |
| download | linux-1bab8d4c488be22d57f9dd09968c90a0ddc413bf.tar.gz linux-1bab8d4c488be22d57f9dd09968c90a0ddc413bf.tar.bz2 linux-1bab8d4c488be22d57f9dd09968c90a0ddc413bf.zip | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net
Pull in bug fixes from 'net' tree for the merge window.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa/dsa2.c')
| -rw-r--r-- | net/dsa/dsa2.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index b501c90aabe4..73002022c9d8 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -644,6 +644,8 @@ static int dsa_port_parse_cpu(struct dsa_port *dp, struct net_device *master) tag_protocol = ds->ops->get_tag_protocol(ds, dp->index); tag_ops = dsa_tag_driver_get(tag_protocol); if (IS_ERR(tag_ops)) { + if (PTR_ERR(tag_ops) == -ENOPROTOOPT) + return -EPROBE_DEFER; dev_warn(ds->dev, "No tagger for this switch\n"); return PTR_ERR(tag_ops); } |