pcmcia: Handle request_irq() failure while opening device
PATCH 2/3 pcmcia: Handle request_irq() failure while opening device
Signed-off-by Monakhov Dmitriy <[email protected]>
--- drivers/net/pcmcia/axnet_cs.c | 8 +++++++- drivers/net/pcmcia/pcnet_cs.c | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-)
drivers/net/pcmcia/axnet_cs.c +7 -1
@@ -523,6 +523,7 @@ static int axnet_open(struct net_device *dev) {axnet_dev_t *info =PRIV (dev);struct pcmcia_device *link = info->p_dev; +int err =0 ;DEBUG (2 ,"axnet_open('%s')\n" , dev->name);
@@ -531,7 +532,12 @@ static int axnet_open(struct net_device *dev) link->open++; -request_irq (dev->irq, ei_irq_wrapper,IRQF_SHARED ,"axnet_cs" , dev); + err =request_irq (dev->irq, ei_irq_wrapper,IRQF_SHARED ,"axnet_cs" , dev); +if (err) { +printk ("axnet_cs: request_irq() failed %s\n" , dev->name); + link->open--; +return -EBUSY ; + } info->link_status =0x00 ;init_timer (&info->watchdog);
drivers/net/pcmcia/pcnet_cs.c +7 -1
@@ -962,6 +962,7 @@ static int pcnet_open(struct net_device *dev) {pcnet_dev_t *info =PRIV (dev);struct pcmcia_device *link = info->p_dev; +int err =0 ;DEBUG (2 ,"pcnet_open('%s')\n" , dev->name);
@@ -971,7 +972,12 @@ static int pcnet_open(struct net_device *dev) link->open++;set_misc_reg (dev); -request_irq (dev->irq, ei_irq_wrapper,IRQF_SHARED , dev_info, dev); + err =request_irq (dev->irq, ei_irq_wrapper,IRQF_SHARED , dev_info, dev); +if (err) { +printk ("pcnet_open: request_irq() failed %s\n" , dev->name); + link->open--; +return -EBUSY ; + } info->phy_id = info->eth_phy; info->link_status =0x00 ;
Signature · 1 line
1.5.0.1
Quoted 19 lines · Monakhov Dmitriy
Signed-off-by Monakhov Dmitriy <[email protected]>--- drivers/net/pcmcia/axnet_cs.c | 8 +++++++- drivers/net/pcmcia/pcnet_cs.c | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-)drivers/net/pcmcia/axnet_cs.c +1
-0@@ -523,6 +523,7 @@ static int axnet_open(struct net_device *dev) {axnet_dev_t *info =PRIV (dev);struct pcmcia_device *link = info->p_dev; +int err =0 ;DEBUG (2 ,"axnet_open('%s')\n" , dev->name);
drivers/net/pcmcia/axnet_cs.c static int axnet_open(struct net_device *dev) · line 539
Quoted 9 lines
drivers/net/pcmcia/axnet_cs.c +5
-1@@ -531,7 +532,12 @@ static int axnet_open(struct net_device *dev) link->open++; -request_irq (dev->irq, ei_irq_wrapper,IRQF_SHARED ,"axnet_cs" , dev); + err =request_irq (dev->irq, ei_irq_wrapper,IRQF_SHARED ,"axnet_cs" , dev); +if (err) { +printk ("axnet_cs: request_irq() failed %s\n" , dev->name); + link->open--; +return -EBUSY ;
As David Miller noted it is better to return exact error code from request_irq(), truly most net_device->open() functions return error code without changing. The updated patch version following:
Signed-off-by Monakhov Dmitriy <[email protected]>
--- drivers/net/pcmcia/axnet_cs.c | 8 +++++++- drivers/net/pcmcia/pcnet_cs.c | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-)
drivers/net/pcmcia/axnet_cs.c +7 -1
@@ -523,6 +523,7 @@ static int axnet_open(struct net_device *dev) {axnet_dev_t *info =PRIV (dev);struct pcmcia_device *link = info->p_dev; +int err =0 ;DEBUG (2 ,"axnet_open('%s')\n" , dev->name);
@@ -531,7 +532,12 @@ static int axnet_open(struct net_device *dev) link->open++; -request_irq (dev->irq, ei_irq_wrapper,IRQF_SHARED ,"axnet_cs" , dev); + err =request_irq (dev->irq, ei_irq_wrapper,IRQF_SHARED ,"axnet_cs" , dev); +if (err) { +printk ("axnet_cs: request_irq() failed %s\n" , dev->name); + link->open--; +return err; + } info->link_status =0x00 ;init_timer (&info->watchdog);
drivers/net/pcmcia/pcnet_cs.c +7 -1
@@ -962,6 +962,7 @@ static int pcnet_open(struct net_device *dev) {pcnet_dev_t *info =PRIV (dev);struct pcmcia_device *link = info->p_dev; +int err =0 ;DEBUG (2 ,"pcnet_open('%s')\n" , dev->name);
@@ -971,7 +972,12 @@ static int pcnet_open(struct net_device *dev) link->open++;set_misc_reg (dev); -request_irq (dev->irq, ei_irq_wrapper,IRQF_SHARED , dev_info, dev); + err =request_irq (dev->irq, ei_irq_wrapper,IRQF_SHARED , dev_info, dev); +if (err) { +printk ("pcnet_open: request_irq() failed %s\n" , dev->name); + link->open--; +return err; + } info->phy_id = info->eth_phy; info->link_status =0x00 ;
Signature · 1 line
1.5.0.1