| Message ID | 1385948684-7284-1-git-send-email-weiyang@linux.vnet.ibm.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On 02/12/2013 03:44, Wei Yang wrote: > When driver registration fails, we need to clean up the resources allocated > before. mlx4_core missed to destroy the workqueue allocated. > > This patch destroies the workqueue when registration fails. > > Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com> > --- > drivers/net/ethernet/mellanox/mlx4/main.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c > index 5789ea2..01fc651 100644 > --- a/drivers/net/ethernet/mellanox/mlx4/main.c > +++ b/drivers/net/ethernet/mellanox/mlx4/main.c > @@ -2635,6 +2635,8 @@ static int __init mlx4_init(void) > return -ENOMEM; > > ret = pci_register_driver(&mlx4_driver); > + if (ret < 0) > + destroy_workqueue(mlx4_wq); > return ret < 0 ? ret : 0; > } > > Acked-By: Amir Vadai <amirv@mellanox.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Dec 2, 2013 at 3:44 AM, Wei Yang <weiyang@linux.vnet.ibm.com> wrote: > When driver registration fails, we need to clean up the resources allocated > before. mlx4_core missed to destroy the workqueue allocated. please use "missed destroying" instead of "missed to destroy" > > This patch destroies the workqueue when registration fails. please s/destroies/destroys/ > > Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com> > --- > drivers/net/ethernet/mellanox/mlx4/main.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c > index 5789ea2..01fc651 100644 > --- a/drivers/net/ethernet/mellanox/mlx4/main.c > +++ b/drivers/net/ethernet/mellanox/mlx4/main.c > @@ -2635,6 +2635,8 @@ static int __init mlx4_init(void) > return -ENOMEM; > > ret = pci_register_driver(&mlx4_driver); > + if (ret < 0) > + destroy_workqueue(mlx4_wq); > return ret < 0 ? ret : 0; > } > > -- > 1.7.5.4 > > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Dec 02, 2013 at 10:11:52PM +0200, Or Gerlitz wrote: >On Mon, Dec 2, 2013 at 3:44 AM, Wei Yang <weiyang@linux.vnet.ibm.com> wrote: >> When driver registration fails, we need to clean up the resources allocated >> before. mlx4_core missed to destroy the workqueue allocated. > >please use "missed destroying" instead of "missed to destroy" > >> >> This patch destroies the workqueue when registration fails. > >please s/destroies/destroys/ Ah, sorry for my poor English, will send another one. > >> >> Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com> >> --- >> drivers/net/ethernet/mellanox/mlx4/main.c | 2 ++ >> 1 files changed, 2 insertions(+), 0 deletions(-) >> >> diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c >> index 5789ea2..01fc651 100644 >> --- a/drivers/net/ethernet/mellanox/mlx4/main.c >> +++ b/drivers/net/ethernet/mellanox/mlx4/main.c >> @@ -2635,6 +2635,8 @@ static int __init mlx4_init(void) >> return -ENOMEM; >> >> ret = pci_register_driver(&mlx4_driver); >> + if (ret < 0) >> + destroy_workqueue(mlx4_wq); >> return ret < 0 ? ret : 0; >> } >> >> -- >> 1.7.5.4 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe netdev" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index 5789ea2..01fc651 100644 --- a/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c @@ -2635,6 +2635,8 @@ static int __init mlx4_init(void) return -ENOMEM; ret = pci_register_driver(&mlx4_driver); + if (ret < 0) + destroy_workqueue(mlx4_wq); return ret < 0 ? ret : 0; }
When driver registration fails, we need to clean up the resources allocated before. mlx4_core missed to destroy the workqueue allocated. This patch destroies the workqueue when registration fails. Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com> --- drivers/net/ethernet/mellanox/mlx4/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)