Attachment 61863 Details for Bug 137960

[patch] mv643xx-request_irq-lock.patch

mv643xx-request_irq-lock.patch (text/plain), 1.40 KB, created by Olaf Hering on 2006-01-02 17:24:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olaf Hering

Created: 2006-01-02 17:24:58 UTC

Size: 1.40 KB

patch

obsolete

>From: "Dale Farnsworth" <dale@farnsworth.org>
>Subject: [PATCH 4/4] mv643xx: Don't call request_irq with a held lock
>
>We can't call request_irq() while holding a spin lock.
>
>Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
>Signed-off-by: Olaf Hering <olh@suse.de>
>
>Index: linux-2.6-mv643xx_enet/drivers/net/mv643xx_eth.c
>===================================================================
>--- linux-2.6-mv643xx_enet.orig/drivers/net/mv643xx_eth.c
>+++ linux-2.6-mv643xx_enet/drivers/net/mv643xx_eth.c
>@@ -655,34 +655,24 @@ static int mv643xx_eth_open(struct net_d
> 	unsigned int port_num = mp->port_num;
> 	int err;
> 
>-	spin_lock_irq(&mp->lock);
>-
> 	err = request_irq(dev->irq, mv643xx_eth_int_handler,
> 			SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
>-
> 	if (err) {
> 		printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n",
> 								port_num);
>-		err = -EAGAIN;
>-		goto out;
>+		return -EAGAIN;
> 	}
> 
>+	spin_lock_irq(&mp->lock);
>+
> 	if (mv643xx_eth_real_open(dev)) {
> 		printk("%s: Error opening interface\n", dev->name);
>+		free_irq(dev->irq, dev);
> 		err = -EBUSY;
>-		goto out_free;
> 	}
> 
> 	spin_unlock_irq(&mp->lock);
> 
>-	return 0;
>-
>-out_free:
>-	free_irq(dev->irq, dev);
>-
>-out:
>-	spin_unlock_irq(&mp->lock);
>-
> 	return err;
> }
> 
>-
>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
>

Actions: View | Diff

Attachments on bug 137960: 61863