svn commit: r291185 - stable/10/sys/ofed/drivers/net/mlx4

[Garrett Cooper]

Author: ngie
Date: Mon Nov 23 09:33:27 2015
New Revision: 291185
URL: https://svnweb.freebsd.org/changeset/base/291185

Log:
  MFC r291047:
  
  Don't leak work if __mlx4_register_vlan(..) fails in
  mlx4_master_immediate_activate_vlan_qos(..)
  
  Differential Revision: https://reviews.freebsd.org/D4203
  Submitted by: Miles Olrich <miles.olrich at isilon.com>
  Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/10/sys/ofed/drivers/net/mlx4/cmd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/ofed/drivers/net/mlx4/cmd.c
==============================================================================
--- stable/10/sys/ofed/drivers/net/mlx4/cmd.c	Mon Nov 23 09:32:32 2015	(r291184)
+++ stable/10/sys/ofed/drivers/net/mlx4/cmd.c	Mon Nov 23 09:33:27 2015	(r291185)
@@ -1784,6 +1784,7 @@ static int mlx4_master_immediate_activat
 				mlx4_warn((&priv->dev),
 					  "No vlan resources slave %d, port %d\n",
 					  slave, port);
+				kfree(work);
 				return err;
 			}
 		} else {