Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1328477

Re: [PATCH v2] net: ethernet: davicom: fix devicetree irq resource

Show all headers | View raw

Francois Romieu <romieu@fr.zoreil.com> writes:

> Robert Jarzmik <robert.jarzmik@free.fr> :
> [...]
>> diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c
>> index cf94b72dbacd..2bae5c8c1f85 100644
>> --- a/drivers/net/ethernet/davicom/dm9000.c
>> +++ b/drivers/net/ethernet/davicom/dm9000.c
> [...]
>> @@ -1500,15 +1496,21 @@ dm9000_probe(struct platform_device *pdev)
>>  
>>  	db->addr_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>>  	db->data_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
>> -	db->irq_res  = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
>>  
>> -	if (db->addr_res == NULL || db->data_res == NULL ||
>> -	    db->irq_res == NULL) {
>> -		dev_err(db->dev, "insufficient resources\n");
>> +	if (!db->addr_res || !db->data_res) {
>> +		dev_err(db->dev, "insufficient resources addr=%p data=%p\n",
>> +			db->addr_res, db->data_res);
>>  		ret = -ENOENT;
>>  		goto out;
>>  	}
>>  
>> +	ndev->irq = platform_get_irq(pdev, 0);
>> +	if (ndev->irq < 0) {
>> +		dev_err(db->dev, "interrupt resource unavailable: %d\n",
>> +			ndev->irq);
>> +		return ndev->irq;
>> +	}
>> +
>
> Leak: please set 'ret = ndev->irq;' and proceed to the 'out' label.
Indeed, the etherdev, good catch.

> If you have some spare time, it would be nice to avoid db->irq_wake leak
> on probe failure or driver removal.
Sorry but not in this patch.

I suppose the right patch would be to use devm_*() in the probe function for
ioremaps and request_irqs, which would address this point.

Cheers.

-- 
Robert

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2] net: ethernet: davicom: fix devicetree irq resource Robert Jarzmik <robert.jarzmik@free.fr> - 2016-02-06 23:20 +0100
  Re: [PATCH v2] net: ethernet: davicom: fix devicetree irq resource Francois Romieu <romieu@fr.zoreil.com> - 2016-02-07 11:30 +0100
    Re: [PATCH v2] net: ethernet: davicom: fix devicetree irq resource Robert Jarzmik <robert.jarzmik@free.fr> - 2016-02-07 11:50 +0100
      Re: [PATCH v2] net: ethernet: davicom: fix devicetree irq resource Francois Romieu <romieu@fr.zoreil.com> - 2016-02-07 13:40 +0100
  Re: [PATCH v2] net: ethernet: davicom: fix devicetree irq resource Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-02-07 11:50 +0100
    Re: [PATCH v2] net: ethernet: davicom: fix devicetree irq resource Robert Jarzmik <robert.jarzmik@free.fr> - 2016-02-07 12:50 +0100

csiph-web