diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-05-16 14:59:00 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-05-16 14:59:00 +0200 |
| commit | a158f2b79ff1948c864a38296ea4249f7296362b (patch) | |
| tree | e62d50376d29a63814cf9d26cbd4c522f6f9271a /net/switchdev/switchdev.c | |
| parent | Merge branch 'for-next' into for-linus (diff) | |
| parent | Merge remote-tracking branch 'asoc/topic/hdmi' into asoc-next (diff) | |
| download | linux-a158f2b79ff1948c864a38296ea4249f7296362b.tar.gz linux-a158f2b79ff1948c864a38296ea4249f7296362b.zip | |
Merge tag 'asoc-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v4.7
The updates this time around are almost all driver code:
- Further slow progress on the topology code.
- Substantial updates and improvements for the da7219, es8328, fsl-ssi
Intel and rcar drivers.
Diffstat (limited to 'net/switchdev/switchdev.c')
| -rw-r--r-- | net/switchdev/switchdev.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index 2b9b98f1c2ff..b7e01d88bdc5 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -305,6 +305,8 @@ static void switchdev_port_attr_set_deferred(struct net_device *dev, if (err && err != -EOPNOTSUPP) netdev_err(dev, "failed (err=%d) to set attribute (id=%d)\n", err, attr->id); + if (attr->complete) + attr->complete(dev, err, attr->complete_priv); } static int switchdev_port_attr_set_defer(struct net_device *dev, @@ -434,6 +436,8 @@ static void switchdev_port_obj_add_deferred(struct net_device *dev, if (err && err != -EOPNOTSUPP) netdev_err(dev, "failed (err=%d) to add object (id=%d)\n", err, obj->id); + if (obj->complete) + obj->complete(dev, err, obj->complete_priv); } static int switchdev_port_obj_add_defer(struct net_device *dev, @@ -502,6 +506,8 @@ static void switchdev_port_obj_del_deferred(struct net_device *dev, if (err && err != -EOPNOTSUPP) netdev_err(dev, "failed (err=%d) to del object (id=%d)\n", err, obj->id); + if (obj->complete) + obj->complete(dev, err, obj->complete_priv); } static int switchdev_port_obj_del_defer(struct net_device *dev, |