* [PATCH] Missing spin_unlock_irqrestore from rrunner driver.
@ 2003-08-11 15:59 davej
2003-08-11 18:11 ` Francois Romieu
0 siblings, 1 reply; 3+ messages in thread
From: davej @ 2003-08-11 15:59 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel, jgarzik
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/net/rrunner.c linux-2.5/drivers/net/rrunner.c
--- bk-linus/drivers/net/rrunner.c 2003-08-04 01:00:27.000000000 +0100
+++ linux-2.5/drivers/net/rrunner.c 2003-08-06 18:59:37.000000000 +0100
@@ -1645,6 +1645,7 @@ static int rr_ioctl(struct net_device *d
printk(KERN_ERR "%s: Error reading EEPROM\n",
dev->name);
error = -EFAULT;
+ spin_unlock_irqrestore(&rrpriv->lock, flags);
goto gf_out;
}
spin_unlock_irqrestore(&rrpriv->lock, flags);
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Missing spin_unlock_irqrestore from rrunner driver.
2003-08-11 15:59 [PATCH] Missing spin_unlock_irqrestore from rrunner driver davej
@ 2003-08-11 18:11 ` Francois Romieu
2003-08-11 18:22 ` Dave Jones
0 siblings, 1 reply; 3+ messages in thread
From: Francois Romieu @ 2003-08-11 18:11 UTC (permalink / raw)
To: davej; +Cc: torvalds, linux-kernel, jgarzik
davej@redhat.com <davej@redhat.com> :
> diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/net/rrunner.c linux-2.5/drivers/net/rrunner.c
> --- bk-linus/drivers/net/rrunner.c 2003-08-04 01:00:27.000000000 +0100
> +++ linux-2.5/drivers/net/rrunner.c 2003-08-06 18:59:37.000000000 +0100
> @@ -1645,6 +1645,7 @@ static int rr_ioctl(struct net_device *d
> printk(KERN_ERR "%s: Error reading EEPROM\n",
> dev->name);
> error = -EFAULT;
> + spin_unlock_irqrestore(&rrpriv->lock, flags);
> goto gf_out;
> }
> spin_unlock_irqrestore(&rrpriv->lock, flags);
> -
Bloat :o)
--- linux-2.6.0-test3/drivers/net/rrunner.c Mon Aug 11 20:03:21 2003
+++ linux-2.6.0-test3/drivers/net/rrunner.c Mon Aug 11 20:03:38 2003
@@ -1641,13 +1641,13 @@ static int rr_ioctl(struct net_device *d
spin_lock_irqsave(&rrpriv->lock, flags);
i = rr_read_eeprom(rrpriv, 0, image, EEPROM_BYTES);
+ spin_unlock_irqrestore(&rrpriv->lock, flags);
if (i != EEPROM_BYTES){
printk(KERN_ERR "%s: Error reading EEPROM\n",
dev->name);
error = -EFAULT;
goto gf_out;
}
- spin_unlock_irqrestore(&rrpriv->lock, flags);
error = copy_to_user(rq->ifr_data, image, EEPROM_BYTES);
if (error)
error = -EFAULT;
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Missing spin_unlock_irqrestore from rrunner driver.
2003-08-11 18:11 ` Francois Romieu
@ 2003-08-11 18:22 ` Dave Jones
0 siblings, 0 replies; 3+ messages in thread
From: Dave Jones @ 2003-08-11 18:22 UTC (permalink / raw)
To: Francois Romieu; +Cc: torvalds, linux-kernel, jgarzik
On Mon, Aug 11, 2003 at 08:11:48PM +0200, Francois Romieu wrote:
> > + spin_unlock_irqrestore(&rrpriv->lock, flags);
> > goto gf_out;
> > }
> > spin_unlock_irqrestore(&rrpriv->lock, flags);
> > -
>
> Bloat :o)
Agreed, yours a much nicer fix.
Dave
--
Dave Jones http://www.codemonkey.org.uk
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2003-08-11 18:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-08-11 15:59 [PATCH] Missing spin_unlock_irqrestore from rrunner driver davej
2003-08-11 18:11 ` Francois Romieu
2003-08-11 18:22 ` Dave Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox