diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-06 13:33:17 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-06 13:33:17 -0700 |
| commit | 9e9623abdaf749138d5f78c40f74d2093f8c90ae (patch) | |
| tree | d136a749e2fdc5fa279c824cd48e659e2818bfb1 | |
| parent | 91e91beff6908a1e54536613b318efd56f6e27c4 (diff) | |
| parent | d1db799e968bf6677ac88a90729945ce0eb3ede5 (diff) | |
| download | linux-9e9623abdaf749138d5f78c40f74d2093f8c90ae.tar.gz | |
Merge branch 'dsa-loop-fixes'
Florian Fainelli says:
====================
net: dsa: Mock-up driver couple fixes
Thanks to Dan's static checker, a bunch of small issues were found in the code.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/dsa/dsa_loop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/dsa/dsa_loop.c b/drivers/net/dsa/dsa_loop.c index bc5acc15edbf21..f0fc4de4fc9a48 100644 --- a/drivers/net/dsa/dsa_loop.c +++ b/drivers/net/dsa/dsa_loop.c @@ -164,7 +164,7 @@ static int dsa_loop_port_vlan_del(struct dsa_switch *ds, int port, struct dsa_loop_priv *ps = ds->priv; struct mii_bus *bus = ps->bus; struct dsa_loop_vlan *vl; - u16 vid, pvid; + u16 vid, pvid = ps->pvid; dev_dbg(ds->dev, "%s\n", __func__); @@ -194,7 +194,7 @@ static int dsa_loop_port_vlan_dump(struct dsa_switch *ds, int port, struct mii_bus *bus = ps->bus; struct dsa_loop_vlan *vl; u16 vid, vid_start = 0; - int err; + int err = 0; dev_dbg(ds->dev, "%s\n", __func__); |