netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] net/mlx4_core: destroy workqueue when driver fails to register
@ 2013-12-02  1:44 Wei Yang
  2013-12-02  8:12 ` Amir Vadai
  2013-12-02 20:11 ` Or Gerlitz
  0 siblings, 2 replies; 6+ messages in thread
From: Wei Yang @ 2013-12-02  1:44 UTC (permalink / raw)
  To: davem, amirv, jackm, netdev; +Cc: Wei Yang

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;
 }
 
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] net/mlx4_core: destroy workqueue when driver fails to register
  2013-12-02  1:44 [PATCH] net/mlx4_core: destroy workqueue when driver fails to register Wei Yang
@ 2013-12-02  8:12 ` Amir Vadai
  2013-12-02 20:11 ` Or Gerlitz
  1 sibling, 0 replies; 6+ messages in thread
From: Amir Vadai @ 2013-12-02  8:12 UTC (permalink / raw)
  To: Wei Yang, davem, jackm, netdev

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>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] net/mlx4_core: destroy workqueue when driver fails to register
  2013-12-02  1:44 [PATCH] net/mlx4_core: destroy workqueue when driver fails to register Wei Yang
  2013-12-02  8:12 ` Amir Vadai
@ 2013-12-02 20:11 ` Or Gerlitz
  2013-12-03  1:36   ` Wei Yang
  1 sibling, 1 reply; 6+ messages in thread
From: Or Gerlitz @ 2013-12-02 20:11 UTC (permalink / raw)
  To: Wei Yang; +Cc: David Miller, Amir Vadai, Jack Morgenstein,
	netdev@vger.kernel.org

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] net/mlx4_core: destroy workqueue when driver fails to register
  2013-12-02 20:11 ` Or Gerlitz
@ 2013-12-03  1:36   ` Wei Yang
  0 siblings, 0 replies; 6+ messages in thread
From: Wei Yang @ 2013-12-03  1:36 UTC (permalink / raw)
  To: Or Gerlitz
  Cc: Wei Yang, David Miller, Amir Vadai, Jack Morgenstein,
	netdev@vger.kernel.org

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

-- 
Richard Yang
Help you, Help me

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH] net/mlx4_core: destroy workqueue when driver fails to register
@ 2013-12-03  2:04 Wei Yang
  2013-12-03 16:56 ` David Miller
  0 siblings, 1 reply; 6+ messages in thread
From: Wei Yang @ 2013-12-03  2:04 UTC (permalink / raw)
  To: davem, amirv, jackm; +Cc: netdev, Wei Yang

When driver registration fails, we need to clean up the resources allocated
before. mlx4_core missed destroying the workqueue allocated.

This patch destroys 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;
 }
 
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] net/mlx4_core: destroy workqueue when driver fails to register
  2013-12-03  2:04 Wei Yang
@ 2013-12-03 16:56 ` David Miller
  0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2013-12-03 16:56 UTC (permalink / raw)
  To: weiyang; +Cc: amirv, jackm, netdev

From: Wei Yang <weiyang@linux.vnet.ibm.com>
Date: Tue,  3 Dec 2013 10:04:10 +0800

> When driver registration fails, we need to clean up the resources allocated
> before. mlx4_core missed destroying the workqueue allocated.
> 
> This patch destroys the workqueue when registration fails.
> 
> Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>

Applied.

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2013-12-03 16:56 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-02  1:44 [PATCH] net/mlx4_core: destroy workqueue when driver fails to register Wei Yang
2013-12-02  8:12 ` Amir Vadai
2013-12-02 20:11 ` Or Gerlitz
2013-12-03  1:36   ` Wei Yang
  -- strict thread matches above, loose matches on Subject: below --
2013-12-03  2:04 Wei Yang
2013-12-03 16:56 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).